[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108053: Backport: Avoid buffer read-only error in ibuffer-diff-buffer-with-file-1

[Leo Liu]

------------------------------------------------------------
revno: 108053
committer: Leo Liu <address@hidden>
branch nick: emacs-24
timestamp: Sun 2012-06-24 10:41:03 +0800
message:
  Backport: Avoid buffer read-only error in ibuffer-diff-buffer-with-file-1
modified:
  lisp/ChangeLog
  lisp/ibuf-ext.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-24 02:34:52 +0000
+++ b/lisp/ChangeLog    2012-06-24 02:41:03 +0000
@@ -1,5 +1,8 @@
 2012-06-24  Leo Liu  <address@hidden>
 
+       * 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.

=== modified file 'lisp/ibuf-ext.el'
--- a/lisp/ibuf-ext.el  2012-01-19 07:21:25 +0000
+++ b/lisp/ibuf-ext.el  2012-06-24 02:41:03 +0000
@@ -1345,8 +1345,8 @@
                (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)))))