diff options
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 @@ | |||
| 1 | 2012-06-24 Leo Liu <sdl.web@gmail.com> | 1 | 2012-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))))) |