aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2012-04-30 19:57:47 +0800
committerLeo Liu2012-04-30 19:57:47 +0800
commit9cc7819c6145afaa2c50c08c3073c28000fcafe3 (patch)
tree2f762fc83eda9cee33d3e2162cf05b61d329bd73
parenta706a3bca4e676dc3b6c7bb1b4a584b085364c0c (diff)
downloademacs-9cc7819c6145afaa2c50c08c3073c28000fcafe3.tar.gz
emacs-9cc7819c6145afaa2c50c08c3073c28000fcafe3.zip
* lisp/ibuf-ext.el (ibuffer-diff-buffer-with-file-1): Avoid buffer
read-only error.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ibuf-ext.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f656ab999a..8e826aa69fa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-04-30 Leo Liu <sdl.web@gmail.com>
2
3 * ibuf-ext.el (ibuffer-diff-buffer-with-file-1): Avoid buffer
4 read-only error.
5
12012-04-29 Chong Yidong <cyd@gnu.org> 62012-04-29 Chong Yidong <cyd@gnu.org>
2 7
3 * follow.el (follow-calc-win-end): Rewrite to handle partial 8 * follow.el (follow-calc-win-end): Rewrite to handle partial
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index f943bd2fe58..58d38f77b66 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -1356,8 +1356,8 @@ a prefix argument reverses the meaning of that variable."
1356 (diff-sentinel 1356 (diff-sentinel
1357 (call-process shell-file-name nil 1357 (call-process shell-file-name nil
1358 (current-buffer) nil 1358 (current-buffer) nil
1359 shell-command-switch command))) 1359 shell-command-switch command))
1360 (insert "\n")))) 1360 (insert "\n")))))
1361 (sit-for 0) 1361 (sit-for 0)
1362 (when (file-exists-p tempfile) 1362 (when (file-exists-p tempfile)
1363 (delete-file tempfile))))) 1363 (delete-file tempfile)))))