aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-06-27 10:34:50 +0000
committerJuanma Barranquero2008-06-27 10:34:50 +0000
commitcdc5b68f33dd04ee15a92d6d6851bde3e5240f3b (patch)
tree820f4f139279691e2ce9c0782b83f28c4861023b
parentfffa137cb7bb78445b2f8aef44d251dfe83f06f6 (diff)
downloademacs-cdc5b68f33dd04ee15a92d6d6851bde3e5240f3b.tar.gz
emacs-cdc5b68f33dd04ee15a92d6d6851bde3e5240f3b.zip
* ibuf-ext.el (diff-sentinel): Declare.
-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 @@
12008-06-27 Juanma Barranquero <lekktu@gmail.com>
2
3 * ibuf-ext.el (diff-sentinel): Declare.
4
12008-06-27 Glenn Morris <rgm@gnu.org> 52008-06-27 Glenn Morris <rgm@gnu.org>
2 6
3 * calendar/lunar.el (calendar-lunar-phases): Rename from 7 * 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."
1298 (error "No buffer with name %s" name) 1298 (error "No buffer with name %s" name)
1299 (goto-char buf-point))))) 1299 (goto-char buf-point)))))
1300 1300
1301(declare-function diff-sentinel "diff" (code))
1302
1301(defun ibuffer-diff-buffer-with-file-1 (buffer) 1303(defun ibuffer-diff-buffer-with-file-1 (buffer)
1302 (let ((bufferfile (buffer-local-value 'buffer-file-name buffer)) 1304 (let ((bufferfile (buffer-local-value 'buffer-file-name buffer))
1303 (tempfile (make-temp-file "buffer-content-"))) 1305 (tempfile (make-temp-file "buffer-content-")))