branch: elpa/rust-mode
commit 620d7182e67793d6c8f81dab70385c652d1ccf62
Author: Fanael Linithien <[email protected]>
Commit: Fanael Linithien <[email protected]>
Fix #160
Use `font-lock-fontify-region` on the whole buffer to actually force
refontification in Emacs 24, which does not support `font-lock-ensure`.
`font-lock-fontify-buffer` is actually closer to `font-lock-flush`, so it's
not
the right function to use in `rust--after-revert-hook`.
---
rust-mode.el | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/rust-mode.el b/rust-mode.el
index 16aaa6d..164c95b 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -1359,13 +1359,13 @@ This is written mainly to be used as
`end-of-defun-function' for Rust."
;; Issue #104: When reverting the buffer, make sure all fontification is redone
;; so that we don't end up missing a non-angle-bracket '<' or '>' character.
(defun rust--after-revert-hook ()
- (let
- ;; Newer emacs versions (25 and later) make `font-lock-fontify-buffer'
- ;; interactive-only, and want lisp code to call `font-lock-flush' or
- ;; `font-lock-ensure'. But those don't exist in emacs 24 and earlier.
- ((font-lock-ensure-fn (if (fboundp 'font-lock-ensure) 'font-lock-ensure
'font-lock-fontify-buffer)))
- (funcall font-lock-ensure-fn))
- )
+ ;; In Emacs 25 and later, the preferred method to force fontification is
+ ;; to use `font-lock-ensure', which doesn't exist in Emacs 24 and earlier.
+ ;; If it's not available, fall back to calling `font-lock-fontify-region'
+ ;; on the whole buffer.
+ (if (fboundp 'font-lock-ensure)
+ (font-lock-ensure)
+ (font-lock-fontify-region (point-min) (point-max))))
(defun rust--before-save-hook ()
(when rust-format-on-save (rust-format-buffer)))
