diff options
| author | Glenn Morris | 2010-12-02 19:01:16 -0800 |
|---|---|---|
| committer | Glenn Morris | 2010-12-02 19:01:16 -0800 |
| commit | c879436a90358f40d439794d453bd532a86d392a (patch) | |
| tree | cc1618334500bf986069a83c97b9286a34af399f /lisp/vc/diff.el | |
| parent | acab4d4b71807cb7b3d19fcf0b64a38c28cd233d (diff) | |
| download | emacs-c879436a90358f40d439794d453bd532a86d392a.tar.gz emacs-c879436a90358f40d439794d453bd532a86d392a.zip | |
diff-sentinel trivia.
* lisp/ibuf-ext.el (diff-sentinel): Update declaration.
* lisp/ibuffer.el: Regenerate autoloads.
* lisp/vc/diff.el (diff-sentinel): Make new arguments optional, eg for
the sake of ibuffer-diff-buffer-with-file-1.
Diffstat (limited to 'lisp/vc/diff.el')
| -rw-r--r-- | lisp/vc/diff.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el index 5809eee9aef..752b12446fe 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el | |||
| @@ -57,7 +57,7 @@ | |||
| 57 | diff-switches | 57 | diff-switches |
| 58 | (mapconcat 'identity diff-switches " "))))) | 58 | (mapconcat 'identity diff-switches " "))))) |
| 59 | 59 | ||
| 60 | (defun diff-sentinel (code old-temp-file new-temp-file) | 60 | (defun diff-sentinel (code &optional old-temp-file new-temp-file) |
| 61 | "Code run when the diff process exits. | 61 | "Code run when the diff process exits. |
| 62 | CODE is the exit code of the process. It should be 0 only if no diffs | 62 | CODE is the exit code of the process. It should be 0 only if no diffs |
| 63 | were found." | 63 | were found." |
| @@ -223,5 +223,4 @@ This requires the external program `diff' to be in your `exec-path'." | |||
| 223 | 223 | ||
| 224 | (provide 'diff) | 224 | (provide 'diff) |
| 225 | 225 | ||
| 226 | ;; arch-tag: 7de2c29b-7ea5-4b85-9b9d-72dd860de2bd | ||
| 227 | ;;; diff.el ends here | 226 | ;;; diff.el ends here |