Mercurial > emacs

changeset 26009:16ee8d330c59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(diff-find-file-name): use `Index:' preferentially.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Wed, 13 Oct 1999 22:26:45 +0000
parents 88c485e220ab
children edea9722f14e
files lisp/diff-mode.el
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/diff-mode.el	Wed Oct 13 17:42:55 1999 +0000
+++ b/lisp/diff-mode.el	Wed Oct 13 22:26:45 1999 +0000
@@ -365,14 +365,16 @@
 		   (condition-case ()
 		       (progn (diff-prev-hunk) (point))
 		     (error (point-min)))))
+	   (header-files
+	    (if (looking-at "[-*][-*][-*] \\(\\S-+\\)\\s-.*\n[-+][-+][-+] \\(\\S-+\\)\\s-.*$")
+		(list (if old (match-string 1) (match-string 2))
+		      (if old (match-string 2) (match-string 1)))
+	      (forward-line 1) nil))
 	   (fs (append
-		(when (looking-at "[-*][-*][-*] \\(\\S-+\\)\\s-.*\n[-+][-+][-+] \\(\\S-+\\)\\s-.*$")
-		  (list (if old (match-string 1) (match-string 2))
-			(if old (match-string 2) (match-string 1))))
-		(progn (forward-line 1) nil)
 		(when (save-excursion
 			(re-search-backward "^Index: \\(.+\\)" limit t))
 		  (list (match-string 1)))
+		header-files
 		(when (re-search-backward "^diff \\(-\\S-+ +\\)*\\(\\S-+\\)\\( +\\(\\S-+\\)\\)?" nil t)
 		  (list (if old (match-string 2) (match-string 4))
 			(if old (match-string 4) (match-string 2))))))