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 /lisp/ibuf-ext.el | |
| 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.
Diffstat (limited to 'lisp/ibuf-ext.el')
| -rw-r--r-- | lisp/ibuf-ext.el | 4 |
1 files changed, 2 insertions, 2 deletions
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 |