summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2016-01-29 00:07:33 -0500
committerKyle Meyer <kyle@kyleam.com>2016-01-29 00:28:37 -0500
commita4edee4069007591d0159df518936a2699123c6e (patch)
tree3f1125f64495d0dafb38e15cfb128c3cb197031e
parent9ab973d0a64b0733528a74f3b8fcefb65a3abb0c (diff)
downloadorg-mode-a4edee4069007591d0159df518936a2699123c6e.tar.gz
org-compat: Update font-lock-ensure alias
* lisp/org-compat.el (org-font-lock-ensure): Add new alias that accepts the same number of arguments as font-lock-ensure does. Use an org- prefix. * lisp/org-clock.el (org-clock-get-clocktable): * lisp/org.el (org-fontify-like-in-org-mode): * lisp/ox-html.el (org-html-fontify-code): * lisp/ox-odt.el (org-odt-do-format-code): * lisp/ox-org.el (org-org-publish-to-org): Use org-font-lock-ensure. See Emacs's bug#22399.
-rw-r--r--lisp/org-clock.el2
-rw-r--r--lisp/org-compat.el6
-rw-r--r--lisp/org.el2
-rw-r--r--lisp/ox-html.el2
-rw-r--r--lisp/ox-odt.el2
-rw-r--r--lisp/ox-org.el2
6 files changed, 9 insertions, 7 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index b5b10eb..143f749 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -2031,7 +2031,7 @@ fontified, and then returned."
(org-mode)
(org-create-dblock props)
(org-update-dblock)
- (font-lock-ensure)
+ (org-font-lock-ensure)
(forward-line 2)
(buffer-substring (point) (progn
(re-search-forward "^[ \t]*#\\+END" nil t)
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 78bdba8..0ccb99b 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -409,8 +409,10 @@ Pass BUFFER to the XEmacs version of `move-to-column'."
(defalias 'format-message 'format))
;; `font-lock-ensure' is only available from 24.4.50 on
-(unless (fboundp 'font-lock-ensure)
- (defalias 'font-lock-ensure 'font-lock-fontify-buffer))
+(defalias 'org-font-lock-ensure
+ (if (fboundp 'font-lock-ensure)
+ #'font-lock-ensure
+ (lambda (&optional _beg _end) (font-lock-fontify-buffer))))
(defmacro org-no-popups (&rest body)
"Suppress popup windows.
diff --git a/lisp/org.el b/lisp/org.el
index 5742491..fd08292 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6497,7 +6497,7 @@ needs to be inserted at a specific position in the font-lock sequence.")
(insert s)
(let ((org-odd-levels-only odd-levels))
(org-mode)
- (font-lock-ensure)
+ (org-font-lock-ensure)
(buffer-string))))
(defvar org-m nil)
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 0588043..b3357ad 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -2047,7 +2047,7 @@ is the language used for CODE, as a string, or nil."
(funcall lang-mode)
(insert code)
;; Fontify buffer.
- (font-lock-ensure)
+ (org-font-lock-ensure)
;; Remove formatting on newline characters.
(save-excursion
(let ((beg (point-min))
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index e89a307..31b06de 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -3167,7 +3167,7 @@ and prefix with \"OrgSrc\". For example,
(with-temp-buffer
(insert code)
(funcall lang-mode)
- (font-lock-ensure)
+ (org-font-lock-ensure)
(buffer-string))))
(fontifier (if use-htmlfontify-p 'org-odt-htmlfontify-string
'org-odt--encode-plain-text))
diff --git a/lisp/ox-org.el b/lisp/ox-org.el
index 020a61f..d9af3f7 100644
--- a/lisp/ox-org.el
+++ b/lisp/ox-org.el
@@ -297,7 +297,7 @@ Return output file name."
(work-buffer (or visitingp (find-file-noselect filename)))
newbuf)
(with-current-buffer work-buffer
- (font-lock-ensure)
+ (org-font-lock-ensure)
(outline-show-all)
(org-show-block-all)
(setq newbuf (htmlize-buffer)))