Commit c879436a authored by Glenn Morris's avatar Glenn Morris
Browse files

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.
parent acab4d4b
2010-12-03 Glenn Morris <rgm@gnu.org>
* vc/diff.el (diff-sentinel): Make new arguments optional.
* ibuf-ext.el (diff-sentinel): Update declaration.
2010-12-03 Daiki Ueno <ueno@unixuser.org>
* epg.el (epg-digest-algorithm-alist): Replace "RMD160" with
......
......@@ -1308,7 +1308,8 @@ a prefix argument reverses the meaning of that variable."
(error "No buffer with name %s" name)
(goto-char buf-point)))))
(declare-function diff-sentinel "diff" (code))
(declare-function diff-sentinel "diff"
(code &optional old-temp-file new-temp-file))
(defun ibuffer-diff-buffer-with-file-1 (buffer)
(let ((bufferfile (buffer-local-value 'buffer-file-name buffer))
......@@ -1594,5 +1595,4 @@ defaults to one."
;; generated-autoload-file: "ibuffer.el"
;; End:
;; arch-tag: 9af21953-deda-4c30-b76d-f81d9128e76d
;;; ibuf-ext.el ends here
......@@ -2639,7 +2639,7 @@ will be inserted before the group at point."
;;;;;; ibuffer-backward-filter-group ibuffer-forward-filter-group
;;;;;; ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group
;;;;;; ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode
;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "fa9822b5ef905f06d8a03dc9ce3a2894")
;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "3840d79a044995c846fe8bbaa9565a2b")
;;; Generated autoloads from ibuf-ext.el
(autoload 'ibuffer-auto-mode "ibuf-ext" "\
......
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment