mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-10 01:34:36 -08:00
Backport: Avoid buffer read-only error in ibuffer-diff-buffer-with-file-1
This commit is contained in:
parent
d939b632e1
commit
a08bd6bfef
2 changed files with 5 additions and 2 deletions
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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)))))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue