From a08bd6bfefff005ee3d2dfb441fce193d8763f17 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Sun, 24 Jun 2012 10:41:03 +0800 Subject: [PATCH] Backport: Avoid buffer read-only error in ibuffer-diff-buffer-with-file-1 --- lisp/ChangeLog | 3 +++ 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 + * 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))))) -- 2.39.5