aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/diff-mode.el
diff options
context:
space:
mode:
authorStefan Monnier2000-09-29 18:05:27 +0000
committerStefan Monnier2000-09-29 18:05:27 +0000
commit1b1b5daebc556a4b25df88fdf1579552fae0ee42 (patch)
tree415a23c2a8f85f8b1705ca438593bf7e9fa35ec4 /lisp/diff-mode.el
parentd68f7f1b1194516a95f07ad8f2dfea56be533e38 (diff)
downloademacs-1b1b5daebc556a4b25df88fdf1579552fae0ee42.tar.gz
emacs-1b1b5daebc556a4b25df88fdf1579552fae0ee42.zip
(diff-add-log-file-name): Remove.
(diff-mode): Use add-log-buffer-file-name-function.
Diffstat (limited to 'lisp/diff-mode.el')
-rw-r--r--lisp/diff-mode.el13
1 files changed, 4 insertions, 9 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index cb4b87bb5fe..a7a45eb0768 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -4,7 +4,7 @@
4 4
5;; Author: Stefan Monnier <monnier@cs.yale.edu> 5;; Author: Stefan Monnier <monnier@cs.yale.edu>
6;; Keywords: patch diff 6;; Keywords: patch diff
7;; Revision: $Id: diff-mode.el,v 1.22 2000/09/21 16:52:23 monnier Exp $ 7;; Revision: $Id: diff-mode.el,v 1.23 2000/09/29 02:25:32 monnier Exp $
8 8
9;; This file is part of GNU Emacs. 9;; This file is part of GNU Emacs.
10 10
@@ -448,6 +448,7 @@ Non-nil OLD means that we want the old file."
448 (cons (cons fs file) diff-remembered-files-alist)) 448 (cons (cons fs file) diff-remembered-files-alist))
449 file))))) 449 file)))))
450 450
451
451(defun diff-mouse-goto-source (event) 452(defun diff-mouse-goto-source (event)
452 "Run `diff-goto-source' for the diff at a mouse click." 453 "Run `diff-goto-source' for the diff at a mouse click."
453 (interactive "e") 454 (interactive "e")
@@ -455,12 +456,6 @@ Non-nil OLD means that we want the old file."
455 (mouse-set-point event) 456 (mouse-set-point event)
456 (diff-goto-source))) 457 (diff-goto-source)))
457 458
458(defun diff-add-log-file-name (log-file)
459 "File name to use in add-log for the hunk at point.
460For use in `add-log-file-name-function'.
461LOG-FILE should be the path to the ChangeLog file."
462 (add-log-file-name (expand-file-name (diff-find-file-name)) log-file))
463
464 459
465(defun diff-ediff-patch () 460(defun diff-ediff-patch ()
466 "Call `ediff-patch-file' on the current buffer." 461 "Call `ediff-patch-file' on the current buffer."
@@ -835,8 +830,8 @@ This mode runs `diff-mode-hook'.
835 ;; add-log support 830 ;; add-log support
836 (set (make-local-variable 'add-log-current-defun-function) 831 (set (make-local-variable 'add-log-current-defun-function)
837 'diff-current-defun) 832 'diff-current-defun)
838 (set (make-local-variable 'add-log-file-name-function) 833 (set (make-local-variable 'add-log-buffer-file-name-function)
839 'diff-add-log-file-name)) 834 'diff-find-file-name))
840 835
841;;;###autoload 836;;;###autoload
842(define-minor-mode diff-minor-mode 837(define-minor-mode diff-minor-mode