diff options
author | Bastien Guerry <bzg@gnu.org> | 2014-04-22 16:07:45 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@gnu.org> | 2014-04-22 16:07:45 +0200 |
commit | 30cb51f1bc9ce5976f492b5df5d30c6298f5a2aa (patch) | |
tree | 782f2f5767065ad571bf5b82a162da96064cf22a /lisp/org/org-entities.el | |
parent | d5ff4ded7a225306017006fc96b0a30180ae6f6b (diff) | |
download | emacs-30cb51f1bc9ce5976f492b5df5d30c6298f5a2aa.tar.gz |
Merge Org 8.2.6-1.
The last merge was from 8.2.5c, but many important bugs got
fixed between 8.2.5c and 8.2.6-1.
Diffstat (limited to 'lisp/org/org-entities.el')
-rw-r--r-- | lisp/org/org-entities.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el index 3670f365137..ba1eed12bdb 100644 --- a/lisp/org/org-entities.el +++ b/lisp/org/org-entities.el @@ -598,7 +598,9 @@ Kind can be any of `latex', `html', `ascii', `latin1', or `utf8'." (princ (format " %-8s \\%-16s %-22s %-13s\n" utf8 name latex html)))))) (with-current-buffer "*Org Entity Help*" - (org-mode)) + (org-mode) + (when org-pretty-entities + (org-toggle-pretty-entities))) (select-window (get-buffer-window "*Org Entity Help*"))) |