aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorLeo Liu2012-06-24 10:41:03 +0800
committerLeo Liu2012-06-24 10:41:03 +0800
commita08bd6bfefff005ee3d2dfb441fce193d8763f17 (patch)
tree2952a41698a47e7cfee5d828961d7f81f3cd4e6c /lisp
parentd939b632e16854db64f4ffc142eb8f9b243c4f5c (diff)
downloademacs-a08bd6bfefff005ee3d2dfb441fce193d8763f17.tar.gz
emacs-a08bd6bfefff005ee3d2dfb441fce193d8763f17.zip
Backport: Avoid buffer read-only error in ibuffer-diff-buffer-with-file-1
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/ibuf-ext.el4
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e75c2d718f..8196cae2056 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-06-24 Leo Liu <sdl.web@gmail.com> 12012-06-24 Leo Liu <sdl.web@gmail.com>
2 2
3 * ibuf-ext.el (ibuffer-diff-buffer-with-file-1): Avoid buffer
4 read-only error.
5
3 * net/rcirc.el (rcirc): Avoid error when process-contact returns t. 6 * net/rcirc.el (rcirc): Avoid error when process-contact returns t.
4 7
5 * vc/diff-mode.el (diff-file-prev/next): Fix typo. 8 * vc/diff-mode.el (diff-file-prev/next): Fix typo.
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 22ec2f5df1f..4c9dfc213ce 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -1345,8 +1345,8 @@ a prefix argument reverses the meaning of that variable."
1345 (diff-sentinel 1345 (diff-sentinel
1346 (call-process shell-file-name nil 1346 (call-process shell-file-name nil
1347 (current-buffer) nil 1347 (current-buffer) nil
1348 shell-command-switch command))) 1348 shell-command-switch command))
1349 (insert "\n")))) 1349 (insert "\n")))))
1350 (sit-for 0) 1350 (sit-for 0)
1351 (when (file-exists-p tempfile) 1351 (when (file-exists-p tempfile)
1352 (delete-file tempfile))))) 1352 (delete-file tempfile)))))