[Emacs-diffs] /srv/bzr/emacs/trunk r102559: diff-sentinel trivia.

[Glenn Morris]

------------------------------------------------------------
revno: 102559
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-12-02 19:01:16 -0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/ibuf-ext.el
  lisp/ibuffer.el
  lisp/vc/diff.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-03 01:52:43 +0000
+++ b/lisp/ChangeLog    2010-12-03 03:01:16 +0000
@@ -1,3 +1,8 @@
+2010-12-03  Glenn Morris  <address@hidden>
+
+       * vc/diff.el (diff-sentinel): Make new arguments optional.
+       * ibuf-ext.el (diff-sentinel): Update declaration.
+
 2010-12-03  Daiki Ueno  <address@hidden>
 
        * epg.el (epg-digest-algorithm-alist): Replace "RMD160" with

=== modified file 'lisp/ibuf-ext.el'
--- a/lisp/ibuf-ext.el  2010-08-29 20:10:43 +0000
+++ b/lisp/ibuf-ext.el  2010-12-03 03:01:16 +0000
@@ -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

=== modified file 'lisp/ibuffer.el'
--- a/lisp/ibuffer.el   2010-10-09 15:44:44 +0000
+++ b/lisp/ibuffer.el   2010-12-03 03:01:16 +0000
@@ -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" "\

=== modified file 'lisp/vc/diff.el'
--- a/lisp/vc/diff.el   2010-11-25 21:59:30 +0000
+++ b/lisp/vc/diff.el   2010-12-03 03:01:16 +0000
@@ -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