diff options
| author | Chong Yidong | 2006-09-22 15:01:41 +0000 |
|---|---|---|
| committer | Chong Yidong | 2006-09-22 15:01:41 +0000 |
| commit | 16abdbe639415ee4f5bab402193efedb83e1352e (patch) | |
| tree | 857fa6f098b93f8fceca0f7a22c5147317ec01c2 | |
| parent | 1d8f4cb627aecfcb07a4ff8fcb4c8b83e3aeaf4b (diff) | |
| download | emacs-16abdbe639415ee4f5bab402193efedb83e1352e.tar.gz emacs-16abdbe639415ee4f5bab402193efedb83e1352e.zip | |
* files.el (save-some-buffers-action-alist): Display diff in
view-mode.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/files.el | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 241087e608e..45a9343206d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-09-22 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * files.el (save-some-buffers-action-alist): Display diff in | ||
| 4 | view-mode. | ||
| 5 | |||
| 1 | 2006-09-22 Masatake YAMATO <jet@gyve.org> | 6 | 2006-09-22 Masatake YAMATO <jet@gyve.org> |
| 2 | 7 | ||
| 3 | * add-log.el (add-log-current-defun): Use `forward-sexp' | 8 | * add-log.el (add-log-current-defun): Use `forward-sexp' |
diff --git a/lisp/files.el b/lisp/files.el index 13fdf0d020b..5af68f6014e 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -3729,7 +3729,13 @@ This requires the external program `diff' to be in your `exec-path'." | |||
| 3729 | ;; Return nil to ask about BUF again. | 3729 | ;; Return nil to ask about BUF again. |
| 3730 | nil) | 3730 | nil) |
| 3731 | "view this file") | 3731 | "view this file") |
| 3732 | (?d diff-buffer-with-file | 3732 | (?d (lambda (buf) |
| 3733 | (save-window-excursion | ||
| 3734 | (diff-buffer-with-file buf)) | ||
| 3735 | (view-buffer (get-buffer-create "*Diff*") | ||
| 3736 | (lambda (ignore) (exit-recursive-edit))) | ||
| 3737 | (recursive-edit) | ||
| 3738 | nil) | ||
| 3733 | "view changes in file")) | 3739 | "view changes in file")) |
| 3734 | "ACTION-ALIST argument used in call to `map-y-or-n-p'.") | 3740 | "ACTION-ALIST argument used in call to `map-y-or-n-p'.") |
| 3735 | 3741 | ||