diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-12-02 19:01:16 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-12-02 19:01:16 -0800 |
| commit | c879436a90358f40d439794d453bd532a86d392a (patch) | |
| tree | cc1618334500bf986069a83c97b9286a34af399f | |
| parent | acab4d4b71807cb7b3d19fcf0b64a38c28cd233d (diff) | |
| download | emacs-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.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/ibuf-ext.el | 4 | ||||
| -rw-r--r-- | lisp/ibuffer.el | 2 | ||||
| -rw-r--r-- | lisp/vc/diff.el | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 086c6a34122..812fa2deba5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el index 196838f248d..33cb9a80bab 100644 --- a/lisp/ibuf-ext.el +++ b/lisp/ibuf-ext.el @@ -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 diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index 052d43b41b6..2dab58fb365 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el @@ -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" "\ 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 |