branch: elpa/telephone-line
commit 0fec3265a0c312abc5084146f3c3472311ed091d
Author: Daniel Bordak <[email protected]>
Commit: Daniel Bordak <[email protected]>
Fix terminology before it's too late.
---
telephone-line-segments.el | 16 ++++++++--------
telephone-line-utils.el | 10 +++++-----
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/telephone-line-segments.el b/telephone-line-segments.el
index a22a7e1b6e..d40c353593 100644
--- a/telephone-line-segments.el
+++ b/telephone-line-segments.el
@@ -26,7 +26,7 @@
(telephone-line-defsegment telephone-line-vc-segment ()
vc-mode
- :compiled t)
+ :preformatted t)
(telephone-line-defsegment telephone-line-process-segment ()
mode-line-process)
@@ -36,7 +36,7 @@
;;Paradox fills this with position info.
(string-trim (format-mode-line mode-line-front-space))
mode-line-position)
- :compiled t)
+ :preformatted t)
(telephone-line-defsegment telephone-line-airline-position-segment ()
(if (eq major-mode 'paradox-menu-mode)
@@ -45,7 +45,7 @@
(telephone-line-defsegment telephone-line-misc-info-segment ()
mode-line-misc-info
- :compiled t)
+ :preformatted t)
(telephone-line-defsegment telephone-line-buffer-segment ()
`(""
@@ -58,15 +58,15 @@
(telephone-line-defsegment telephone-line-simple-major-mode-segment ()
"%[%m%]"
- :compiled t)
+ :preformatted t)
(telephone-line-defsegment telephone-line-simple-minor-mode-segment ()
minor-mode-alist
- :compiled t)
+ :preformatted t)
(telephone-line-defsegment telephone-line-narrow-segment ()
"%n"
- :compiled t)
+ :preformatted t)
(telephone-line--defsegment-plist telephone-line-major-mode-segment ()
(let ((recursive-edit-help-echo "Recursive edit, type C-M-c to get out"))
@@ -97,7 +97,7 @@ mouse-3: Toggle minor modes"
(telephone-line-defsegment telephone-line-erc-modified-channels-segment ()
(when (boundp 'erc-modified-channels-object)
(string-trim erc-modified-channels-object))
- :compiled t)
+ :preformatted t)
(eval-after-load 'evil
'(telephone-line-defsegment telephone-line-evil-tag-segment ()
@@ -131,7 +131,7 @@ mouse-3: Toggle minor modes"
(eval-after-load 'workgroups2
'(telephone-line-defsegment telephone-line-workgroups2-segment ()
(wg-mode-line-string)
- :compiled t))
+ :preformatted t))
(provide 'telephone-line-segments)
;;; telephone-line-segments.el ends here
diff --git a/telephone-line-utils.el b/telephone-line-utils.el
index 83192091b0..d8e721389c 100644
--- a/telephone-line-utils.el
+++ b/telephone-line-utils.el
@@ -224,11 +224,11 @@ color1 and color2."
(clrhash (oref obj image-cache)))
;;;###autoload
-(cl-defmacro telephone-line-defsegment (name args body &key compiled)
+(cl-defmacro telephone-line-defsegment (name args body &key preformatted)
"Create function NAME by wrapping BODY with telephone-line padding and
propertization."
(declare (indent defun))
`(defun ,name (face)
- (telephone-line-raw ,body ,compiled)))
+ (telephone-line-raw ,body ,preformatted)))
(defalias 'telephone-line-defsegment* #'telephone-line-defsegment)
@@ -242,12 +242,12 @@ color1 and color2."
,plists))))
;;;###autoload
-(defun telephone-line-raw (str &optional compiled)
- "Conditionally render STR as mode-line data, or just verify output if not
COMPILED.
+(defun telephone-line-raw (str &optional preformatted)
+ "Conditionally render STR as mode-line data, or just verify output if not
PREFORMATTED.
Return nil for blank/empty strings."
(let ((trimmed-str (string-trim (format-mode-line str))))
(unless (seq-empty-p trimmed-str)
- (if compiled
+ (if preformatted
(replace-regexp-in-string "%" "%%" trimmed-str)
str))))
