aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-02-27 20:11:15 -0500
committerChong Yidong2010-02-27 20:11:15 -0500
commit8c3e96d2f0e4fee24498567c5840eb8d03d26720 (patch)
tree33f4c223f23b3c2e7afd713aadc0ec8f355a5f5f
parentc53b9c3b0ab88ca57fa247c22858e6385f12c0d2 (diff)
downloademacs-8c3e96d2f0e4fee24498567c5840eb8d03d26720.tar.gz
emacs-8c3e96d2f0e4fee24498567c5840eb8d03d26720.zip
Fix save-excursion warning in files.el.
* files.el (recover-session-finish): Use with-current-buffer instead of save-excursion.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/files.el3
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a51b18cbf5..27890d66ba6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-02-28 Chong Yidong <cyd@stupidchicken.com>
2
3 * files.el (recover-session-finish): Use with-current-buffer
4 instead of save-excursion.
5
12010-02-27 Stefan Monnier <monnier@iro.umontreal.ca> 62010-02-27 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 Fix in-buffer completion when after-change-functions modify the buffer. 8 Fix in-buffer completion when after-change-functions modify the buffer.
diff --git a/lisp/files.el b/lisp/files.el
index d6783f82fbb..f0a8d72d3f0 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5034,9 +5034,8 @@ This command is used in the special Dired buffer created by
5034 (dired-unmark 1) 5034 (dired-unmark 1)
5035 (dired-do-flagged-delete t) 5035 (dired-do-flagged-delete t)
5036 (unwind-protect 5036 (unwind-protect
5037 (save-excursion 5037 (with-current-buffer buffer
5038 ;; Read in the auto-save-list file. 5038 ;; Read in the auto-save-list file.
5039 (set-buffer buffer)
5040 (erase-buffer) 5039 (erase-buffer)
5041 (insert-file-contents file) 5040 (insert-file-contents file)
5042 ;; Loop thru the text of that file 5041 ;; Loop thru the text of that file