diff options
| author | Glenn Morris | 2010-12-09 19:47:49 -0800 |
|---|---|---|
| committer | Glenn Morris | 2010-12-09 19:47:49 -0800 |
| commit | 66f782de2eb1eb3fad467d76a46e847092e2aa5a (patch) | |
| tree | 3249925562f1c77cb223a4253df11b5c0ac7189c | |
| parent | e554b3f832056ebc65e98c1c2ae44e06bd660068 (diff) | |
| download | emacs-66f782de2eb1eb3fad467d76a46e847092e2aa5a.tar.gz emacs-66f782de2eb1eb3fad467d76a46e847092e2aa5a.zip | |
* lisp/files.el (diff-no-select): Declare.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/files.el | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 32060096aa7..4043498c2e5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-12-10 Glenn Morris <rgm@gnu.org> | 1 | 2010-12-10 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * files.el (diff-no-select): Declare. | ||
| 4 | |||
| 3 | * mail/emacsbug.el (report-emacs-bug): Use mail-user-agent properties. | 5 | * mail/emacsbug.el (report-emacs-bug): Use mail-user-agent properties. |
| 4 | (report-emacs-bug-create-existing-bugs-buffer): Avoid free variables. | 6 | (report-emacs-bug-create-existing-bugs-buffer): Avoid free variables. |
| 5 | 7 | ||
diff --git a/lisp/files.el b/lisp/files.el index 43ba34f8bef..09e2a4e0725 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -4500,6 +4500,9 @@ Before and after saving the buffer, this function runs | |||
| 4500 | (setq buffer-backed-up nil)))))) | 4500 | (setq buffer-backed-up nil)))))) |
| 4501 | setmodes)) | 4501 | setmodes)) |
| 4502 | 4502 | ||
| 4503 | (declare-function diff-no-select "diff" | ||
| 4504 | (old new &optional switches no-async buf)) | ||
| 4505 | |||
| 4503 | (defvar save-some-buffers-action-alist | 4506 | (defvar save-some-buffers-action-alist |
| 4504 | `((?\C-r | 4507 | `((?\C-r |
| 4505 | ,(lambda (buf) | 4508 | ,(lambda (buf) |