Mercurial > emacs

changeset 31735:9d50fe5df6ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved closer to its users.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 19 Sep 2000 16:25:43 +0000
parents 6b057ae8165d
children 64e334e97502
files lisp/diff-mode.el
diffstat 1 files changed, 22 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/diff-mode.el	Tue Sep 19 16:24:30 2000 +0000
+++ b/lisp/diff-mode.el	Tue Sep 19 16:25:43 2000 +0000
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: patch diff
-;; Revision: $Id: diff-mode.el,v 1.15 2000/09/19 02:43:33 miles Exp $
+;; Revision: $Id: diff-mode.el,v 1.16 2000/09/19 16:24:30 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -447,27 +447,6 @@
 	      (cons (cons fs file) diff-remembered-files-alist))
 	 file)))))
 
-(defun diff-find-source-location (&optional other-file)
-  "Find out (FILE LINE)."
-  (save-excursion
-    (diff-beginning-of-hunk)
-    (let* ((old (if (not other-file) diff-jump-to-old-file-flag
-		  (not diff-jump-to-old-file-flag)))
-	   ;; Find the location specification.
-	   (loc (if (not (looking-at "\\(?:\\*\\{15\\}.*\n\\)?[-@* ]*\\([0-9,]+\\)\\([ acd+]+\\([0-9,]+\\)\\)?"))
-		    (error "Can't find the hunk header")
-		  (if old (match-string 1)
-		    (if (match-end 3) (match-string 3)
-		      (unless (re-search-forward "^--- \\([0-9,]+\\)" nil t)
-			(error "Can't find the hunk separator"))
-		      (match-string 1)))))
-	   (file (diff-find-file-name old)))
-      ;; Update the user preference if he so wished.
-      (when (> (prefix-numeric-value other-file) 8)
-	(setq diff-jump-to-old-file-flag old))
-      (if (null file) (error "Can't find the file")
-	(list file (string-to-number loc))))))
-
 (defun diff-mouse-goto-source (event)
   "Run `diff-goto-source' for the diff at a mouse click."
   (interactive "e")
@@ -973,6 +952,27 @@
 	(if (> (- forw orig) (- orig back)) back forw)
       (or back forw))))
 
+(defun diff-find-source-location (&optional other-file)
+  "Find out (FILE LINE)."
+  (save-excursion
+    (diff-beginning-of-hunk)
+    (let* ((old (if (not other-file) diff-jump-to-old-file-flag
+		  (not diff-jump-to-old-file-flag)))
+	   ;; Find the location specification.
+	   (loc (if (not (looking-at "\\(?:\\*\\{15\\}.*\n\\)?[-@* ]*\\([0-9,]+\\)\\([ acd+]+\\([0-9,]+\\)\\)?"))
+		    (error "Can't find the hunk header")
+		  (if old (match-string 1)
+		    (if (match-end 3) (match-string 3)
+		      (unless (re-search-forward "^--- \\([0-9,]+\\)" nil t)
+			(error "Can't find the hunk separator"))
+		      (match-string 1)))))
+	   (file (diff-find-file-name old)))
+      ;; Update the user preference if he so wished.
+      (when (> (prefix-numeric-value other-file) 8)
+	(setq diff-jump-to-old-file-flag old))
+      (if (null file) (error "Can't find the file")
+	(list file (string-to-number loc))))))
+
 (defun diff-apply-hunk (&optional reverse other-file dry-run popup noerror)
   "Apply the current hunk to the source file.
 By default, the new source file is patched, but if the variable