From 002645bd38add90d74507ef0e50d44b3ec641952 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 14 Feb 2009 21:41:26 +0000 Subject: [PATCH] (with-buffer-prepared-for-jit-lock): Swap the `let' and the `with-buffer-unmodified' to avoid useless `readlink' calls. --- lisp/ChangeLog | 9 +++++++-- lisp/jit-lock.el | 20 +++++++++++--------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cf008053348..7d7d253fc24 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-02-14 Stefan Monnier + + * 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 * 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 384771e4f25..786d2b16c48 100644 --- 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)))) -- 2.39.5