summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-07-03 15:06:39 +0200
committerBastien Guerry <bzg@altern.org>2013-07-03 15:06:39 +0200
commitb0174feaa1286fd968e5b481fd424eebd5416845 (patch)
tree15a1dacdf8e856291eed13c485809729751a3ce3
parent82a9f66f467d2eeb06739bb97a83353b64a2aa6d (diff)
parentf12976440a19d42db8c529d796b7650ca4578a81 (diff)
downloadorg-mode-b0174feaa1286fd968e5b481fd424eebd5416845.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 7b40dcd..cfbc5b6 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5146,8 +5146,7 @@ Support for group tags is controlled by the option
(mapcar (lambda (w) (substring w 0 -1))
(list org-scheduled-string org-deadline-string
org-clock-string org-closed-string)))
- (org-compute-latex-and-related-regexp)
- (org-set-font-lock-defaults))))
+ (org-compute-latex-and-related-regexp))))
(defun org-file-contents (file &optional noerror)
"Return the contents of FILE, as a string."
@@ -5331,6 +5330,7 @@ The following commands are available:
(setq buffer-display-table org-display-table))
(org-set-regexps-and-options-for-tags)
(org-set-regexps-and-options)
+ (org-set-font-lock-defaults)
(when (and org-tag-faces (not org-tags-special-faces-re))
;; tag faces set outside customize.... force initialization.
(org-set-tag-faces 'org-tag-faces org-tag-faces))