Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-01-11 01:35:18 +01:00
commit 525304cbda
1 changed files with 3 additions and 2 deletions

View File

@ -1026,10 +1026,11 @@ Also apply the translations defined in `org-xemacs-key-equivalents'."
(defcustom org-ellipsis nil (defcustom org-ellipsis nil
"The ellipsis to use in the Org-mode outline. "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. 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). 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." effective."
:group 'org-startup :group 'org-startup
:type '(choice (const :tag "Default" nil) :type '(choice (const :tag "Default" nil)