diff options
| author | Leo Liu <sdl.web@gmail.com> | 2012-06-24 10:41:03 +0800 |
|---|---|---|
| committer | Leo Liu <sdl.web@gmail.com> | 2012-06-24 10:41:03 +0800 |
| commit | a08bd6bfefff005ee3d2dfb441fce193d8763f17 (patch) | |
| tree | 2952a41698a47e7cfee5d828961d7f81f3cd4e6c /lisp | |
| parent | d939b632e16854db64f4ffc142eb8f9b243c4f5c (diff) | |
| download | emacs-a08bd6bfefff005ee3d2dfb441fce193d8763f17.tar.gz emacs-a08bd6bfefff005ee3d2dfb441fce193d8763f17.tar.bz2 emacs-a08bd6bfefff005ee3d2dfb441fce193d8763f17.zip | |
Backport: Avoid buffer read-only error in ibuffer-diff-buffer-with-file-1
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/ibuf-ext.el | 4 |
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 @@ 2012-06-24 Leo Liu <sdl.web@gmail.com> + * ibuf-ext.el (ibuffer-diff-buffer-with-file-1): Avoid buffer + read-only error. + * net/rcirc.el (rcirc): Avoid error when process-contact returns t. * 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." (diff-sentinel (call-process shell-file-name nil (current-buffer) nil - shell-command-switch command))) - (insert "\n")))) + shell-command-switch command)) + (insert "\n"))))) (sit-for 0) (when (file-exists-p tempfile) (delete-file tempfile))))) |