Mercurial > emacs
changeset 111797:b2c5606310f5
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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 02 Dec 2010 19:01:16 -0800 |
| parents | 0bee817318b0 |
| children | 636a2b5cff1d |
| files | lisp/ChangeLog lisp/ibuf-ext.el lisp/ibuffer.el lisp/vc/diff.el |
| diffstat | 4 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Dec 02 18:57:46 2010 -0800 +++ b/lisp/ChangeLog Thu Dec 02 19:01:16 2010 -0800 @@ -1,3 +1,8 @@ +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
--- a/lisp/ibuf-ext.el Thu Dec 02 18:57:46 2010 -0800 +++ b/lisp/ibuf-ext.el Thu Dec 02 19:01:16 2010 -0800 @@ -1308,7 +1308,8 @@ (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 @@ ;; generated-autoload-file: "ibuffer.el" ;; End: -;; arch-tag: 9af21953-deda-4c30-b76d-f81d9128e76d ;;; ibuf-ext.el ends here
--- a/lisp/ibuffer.el Thu Dec 02 18:57:46 2010 -0800 +++ b/lisp/ibuffer.el Thu Dec 02 19:01:16 2010 -0800 @@ -2639,7 +2639,7 @@ ;;;;;; 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" "\
--- a/lisp/vc/diff.el Thu Dec 02 18:57:46 2010 -0800 +++ b/lisp/vc/diff.el Thu Dec 02 19:01:16 2010 -0800 @@ -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 @@ (provide 'diff) -;; arch-tag: 7de2c29b-7ea5-4b85-9b9d-72dd860de2bd ;;; diff.el ends here