aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2000-10-04 21:31:40 +0000
committerMiles Bader2000-10-04 21:31:40 +0000
commit55d5d71752cfbc323ce78e08e6fc661036e5ed84 (patch)
tree10961157b872e08dbc7ea9d801b7a9f56923888e
parent3dc78168e1df2966e8fd9ebd213baf472583c3f7 (diff)
downloademacs-55d5d71752cfbc323ce78e08e6fc661036e5ed84.tar.gz
emacs-55d5d71752cfbc323ce78e08e6fc661036e5ed84.zip
(diff-goto-source):
Update call to `diff-hunk-status-msg' to reflect new REV variable.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/diff-mode.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a8d0ab8309e..112a91b8671 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12000-10-05 Miles Bader <miles@gnu.org>
2
3 * diff-mode.el (diff-goto-source): Update call to
4 `diff-hunk-status-msg' to reflect new REV variable.
5
12000-10-04 Gerd Moellmann <gerd@gnu.org> 62000-10-04 Gerd Moellmann <gerd@gnu.org>
2 7
3 * startup.el (fancy-splash-pending-command): New variable. 8 * startup.el (fancy-splash-pending-command): New variable.
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 6b2d8e66faa..682d2e912e0 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.26 2000/10/02 06:49:21 miles Exp $ 7;; Revision: $Id: diff-mode.el,v 1.27 2000/10/03 18:36:36 monnier Exp $
8 8
9;; This file is part of GNU Emacs. 9;; This file is part of GNU Emacs.
10 10
@@ -1074,7 +1074,7 @@ If the prefix arg is bigger than 8 (for example with \\[universal-argument] \\[u
1074 (diff-find-source-location other-file rev) 1074 (diff-find-source-location other-file rev)
1075 (pop-to-buffer buf) 1075 (pop-to-buffer buf)
1076 (goto-char (+ pos (cdr src))) 1076 (goto-char (+ pos (cdr src)))
1077 (diff-hunk-status-msg line-offset (not switched) t)))) 1077 (diff-hunk-status-msg line-offset (diff-xor rev switched) t))))
1078 1078
1079 1079
1080(defun diff-current-defun () 1080(defun diff-current-defun ()