summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/ibuf-ext.el2
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ebb74295d05..e523de3f28d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-27 Juanma Barranquero <lekktu@gmail.com>
+
+ * ibuf-ext.el (diff-sentinel): Declare.
+
2008-06-27 Glenn Morris <rgm@gnu.org>
* calendar/lunar.el (calendar-lunar-phases): Rename from
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 2624fdaff69..f23a14adc35 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -1298,6 +1298,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))
+
(defun ibuffer-diff-buffer-with-file-1 (buffer)
(let ((bufferfile (buffer-local-value 'buffer-file-name buffer))
(tempfile (make-temp-file "buffer-content-")))