[nongnu] elpa/rust-mode b3b0f78 259/486: Merge pull request #161 from Fanael/master

[ELPA Syncer]

branch: elpa/rust-mode
commit b3b0f780b1872951874b2ed05eb476ef6e980c09
Merge: 0cf2bc3 620d718
Author: Niko Matsakis <niko@alum.mit.edu>
Commit: GitHub <noreply@github.com>

    Merge pull request #161 from Fanael/master
    
    Fix #160
---
 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)))