summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-01-11 00:35:18 (GMT)
committer Bastien Guerry <bzg@altern.org>2014-01-11 00:35:18 (GMT)
commit525304cbdae5fdd13c661f6d0400a378ca47deef (patch)
treed036376524cc2dcd24488ef8dbea20335d1ef5dd
parentd19fe8cb72e7b448dad74d6623c64adb24e4e4f6 (diff)
parent89147ede728260627cc6093304c3f1a0e3f3c927 (diff)
downloadorg-mode-525304cbdae5fdd13c661f6d0400a378ca47deef.zip
org-mode-525304cbdae5fdd13c661f6d0400a378ca47deef.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 74b0387..3ab895c 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -1026,10 +1026,11 @@ Also apply the translations defined in `org-xemacs-key-equivalents'."
(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 instead,
+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 `M-x org-mode' in a buffer to become
+Changing this requires executing `M-x org-mode RET' in a buffer to become
effective."
:group 'org-startup
:type '(choice (const :tag "Default" nil)