(with-buffer-prepared-for-jit-lock): Swap the `let' and

the `with-buffer-unmodified' to avoid useless `readlink' calls.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf00805334833005f205b1ee0ce8af23efb32f1e..7d7d253fc24b3e54119b49a9c30f7d20e54206d4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * jit-lock.el (with-buffer-prepared-for-jit-lock): Swap the `let' and
+       the `with-buffer-unmodified' to avoid useless `readlink' calls.
+
 2009-02-14  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
 
        * textmodes/bibtex.el (bibtex-global-key-alist)
@@ -18,8 +23,8 @@
        around forms that refer to translation-table-for-input.
 
        * international/quail.el (quail-input-string-to-events)
-       (quail-store-decode-map-key, quail-char-equal-p): Use
-       `with-no-warnings' around forms that refer to
+       (quail-store-decode-map-key, quail-char-equal-p):
+       Use `with-no-warnings' around forms that refer to
        translation-table-for-input.
 
        * simple.el (quoted-insert, zap-to-char): Use `with-no-warnings'

diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 384771e4f25a1a212bd9dc79daf7a8634d216ca4..786d2b16c4820c527ffbdbe0ef82e83565114dfc 100644 (file)
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -45,15 +45,17 @@
     "Execute BODY in current buffer, overriding several variables.
 Preserves the `buffer-modified-p' state of the current buffer."
     (declare (debug t))
-    `(with-buffer-unmodified
-      (let ((buffer-undo-list t)
-           (inhibit-read-only t)
-           (inhibit-point-motion-hooks t)
-           (inhibit-modification-hooks t)
-           deactivate-mark
-           buffer-file-name
-           buffer-file-truename)
-       ,@body))))
+    `(let ((buffer-undo-list t)
+           (inhibit-read-only t)
+           (inhibit-point-motion-hooks t)
+           (inhibit-modification-hooks t)
+           deactivate-mark
+           buffer-file-name
+           buffer-file-truename)
+       ;; Do reset the modification status from within the let, since
+       ;; otherwise set-buffer-modified-p may try to unlock the file.
+       (with-buffer-unmodified
+           ,@body))))
 
 
 \f