summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2016-10-09 21:41:25 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2016-10-09 21:41:25 +0200
commit191fe8209f9cad3f0a90dd105df4474861be5ad9 (patch)
tree89d3823963d570104c01f4fac000c6e89c6597e1
parente7969f29d74cee098af7bb0fcb8f5c2b9a1309a3 (diff)
downloadorg-mode-191fe8209f9cad3f0a90dd105df4474861be5ad9.tar.gz
Make use of `org-ellipsis' face
* lisp/org.el (org-ellipsis): Do not allow to specify a face since `org-ellipsis' face can be modified instead. (org-mode): Use `org-ellipsis', independently on the value of `org-ellipsis' (the string). Reported-by: Vasilij Schneidermann <v.schneidermann@gmail.com> <http://permalink.gmane.org/gmane.emacs.orgmode/109543>
-rw-r--r--lisp/org.el13
1 files changed, 6 insertions, 7 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 6d5201b..f6bc77b 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -1110,16 +1110,17 @@ Or return the original if not disputed."
(defcustom org-ellipsis nil
"The ellipsis to use in the Org mode outline.
+
When nil, just use the standard three dots.
When a string, use that string instead.
-When a face, use the standard 3 dots, but with the specified face.
+
The change affects only Org mode (which will then use its own display table).
Changing this requires executing \\[org-mode] in a buffer to become
effective."
:group 'org-startup
:type '(choice (const :tag "Default" nil)
- (face :tag "Face" :value org-warning)
- (string :tag "String" :value "...#")))
+ (string :tag "String" :value "...#"))
+ :safe #'string-or-null-p)
(defvar org-display-table nil
"The display table for org-mode, in case `org-ellipsis' is non-nil.")
@@ -5540,10 +5541,8 @@ The following commands are available:
(setq org-display-table (make-display-table)))
(set-display-table-slot
org-display-table 4
- (vconcat (mapcar
- (lambda (c) (make-glyph-code c (and (not (stringp org-ellipsis))
- org-ellipsis)))
- (if (stringp org-ellipsis) org-ellipsis "..."))))
+ (vconcat (mapcar (lambda (c) (make-glyph-code c 'org-ellipsis))
+ (if (stringp org-ellipsis) org-ellipsis "..."))))
(setq buffer-display-table org-display-table))
(org-set-regexps-and-options)
(org-set-font-lock-defaults)