(diff-current-defun): Use `buffer-local-value'.

2 files changed, 14 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 57ef230910e..53a2b992235 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,6 +9,12 @@
 
 2008-05-15  John Paul Wallington  <jpw@pobox.com>
 
+        * arc-mode.el (archive-add-new-member): Use `derived-mode-p'.
+        (archive-*-extract): Use `zerop'
+        (archive-*-write-file-member): Use `or', use `zerop'.
+
+        * diff-mode.el (diff-current-defun): Use `buffer-local-value'.
+
         * ibuffer.el (ibuffer-assert-ibuffer-mode): New defsubst.
         (ibuffer-mark-interactive, ibuffer-set-mark)
         (ibuffer-insert-buffer-line, ibuffer-redisplay-current)
@@ -16,6 +22,13 @@
         (ibuffer-update-title-and-summary)
         (ibuffer-redisplay-engine): Use it.
 
+        * ibuf-ext.el (ibuffer-interactive-filter-by-mode)
+        (ibuffer-set-filter-groups-by-mode, ibuffer-list-buffer-modes)
+        (define-ibuffer-filter mode, define-ibuffer-filter used-mode)
+        (define-ibuffer-sorter major-mode, ibuffer-mark-unsaved-buffers)
+        (ibuffer-mark-read-only-buffers)
+        (ibuffer-mark-dired-buffers): Use `buffer-local-value'.
+
         * ibuf-macs.el (ibuffer-aif, ibuffer-awhen, ibuffer-save-marks)
         (define-ibuffer-column, define-ibuffer-sorter)
         (define-ibuffer-op, define-ibuffer-filter): Add declarations
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 0090a61d0ab..4913ef72e35 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -1717,7 +1717,7 @@ For use in `add-log-current-defun-function'."
             (let ((old (if switched dst src)))
               (with-temp-buffer
                 (insert (car old))
-                (funcall (with-current-buffer buf major-mode))
+                (funcall (buffer-local-value 'major-mode buf))
                 (goto-char (+ (point-min) (cdr old)))
                 (add-log-current-defun))))
           (with-current-buffer buf