aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/diff-mode.el
diff options
context:
space:
mode:
authorStefan Monnier2000-10-15 04:49:55 +0000
committerStefan Monnier2000-10-15 04:49:55 +0000
commit30cdf899d795651977cd4b4b761671024f06f747 (patch)
tree156ad2f8267e00277e42fb9852eaf0155e1f351e /lisp/diff-mode.el
parent70e58f900243cdddd46910ce406bbfe2f5767891 (diff)
downloademacs-30cdf899d795651977cd4b4b761671024f06f747.tar.gz
emacs-30cdf899d795651977cd4b4b761671024f06f747.zip
(diff-find-file-name): Fix regexp.
Diffstat (limited to 'lisp/diff-mode.el')
-rw-r--r--lisp/diff-mode.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 682d2e912e0..42fd7edbfcb 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.27 2000/10/03 18:36:36 monnier Exp $ 7;; Revision: $Id: diff-mode.el,v 1.28 2000/10/04 21:29:59 miles Exp $
8 8
9;; This file is part of GNU Emacs. 9;; This file is part of GNU Emacs.
10 10
@@ -413,7 +413,7 @@ Non-nil OLD means that we want the old file."
413 (progn (diff-hunk-prev) (point)) 413 (progn (diff-hunk-prev) (point))
414 (error (point-min))))) 414 (error (point-min)))))
415 (header-files 415 (header-files
416 (if (looking-at "[-*][-*][-*] \\(\\S-+\\)\\s-.*\n[-+][-+][-+] \\(\\S-+\\)\\s-.*$") 416 (if (looking-at "[-*][-*][-*] \\(\\S-+\\)\\(\\s-.*\\)?\n[-+][-+][-+] \\(\\S-+\\)")
417 (list (if old (match-string 1) (match-string 2)) 417 (list (if old (match-string 1) (match-string 2))
418 (if old (match-string 2) (match-string 1))) 418 (if old (match-string 2) (match-string 1)))
419 (forward-line 1) nil)) 419 (forward-line 1) nil))