summaryrefslogtreecommitdiff
path: root/lisp/vc/diff.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-12-02 19:01:16 -0800
committerGlenn Morris <rgm@gnu.org>2010-12-02 19:01:16 -0800
commitc879436a90358f40d439794d453bd532a86d392a (patch)
treecc1618334500bf986069a83c97b9286a34af399f /lisp/vc/diff.el
parentacab4d4b71807cb7b3d19fcf0b64a38c28cd233d (diff)
downloademacs-c879436a90358f40d439794d453bd532a86d392a.tar.gz
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.el3
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 @@
diff-switches
(mapconcat 'identity diff-switches " ")))))
-(defun diff-sentinel (code old-temp-file new-temp-file)
+(defun diff-sentinel (code &optional old-temp-file new-temp-file)
"Code run when the diff process exits.
CODE is the exit code of the process. It should be 0 only if no diffs
were found."
@@ -223,5 +223,4 @@ This requires the external program `diff' to be in your `exec-path'."
(provide 'diff)
-;; arch-tag: 7de2c29b-7ea5-4b85-9b9d-72dd860de2bd
;;; diff.el ends here