emacs: lisp/diff-mode.el comparison

comparison lisp/diff-mode.el @ 98174:841e92880f11

(diff-find-file-name): Rename `batch' to `noprompt' and be more honest when we don't know. (diff-tell-file-name): Don't prompt before the actual prompt. (diff-mode): Don't prompt in add-log-buffer-file-name-function. (diff-find-source-location): Add `noprompt' argument. (diff-current-defun): Don't prompt.

author	Stefan Monnier <monnier@iro.umontreal.ca>
date	Sun, 14 Sep 2008 21:16:30 +0000
parents	4c6e2fb9905e
children	d42aff5ca541

comparison

equal deleted inserted replaced

-:c0d486723fb3
+:841e92880f11
 (interactive
 (let* ((old current-prefix-arg)
 	  (fs (diff-hunk-file-names current-prefix-arg)))
 (unless fs (error "No file name to look for"))
 (list old (read-file-name (format "File for %s: " (car fs))
-			       nil (diff-find-file-name old) t))))
+			       nil (diff-find-file-name old 'noprompt) t))))
 (let ((fs (diff-hunk-file-names old)))
 (unless fs (error "No file name to look for"))
 (push (cons fs name) diff-remembered-files-alist)))
 (defun diff-hunk-file-names (&optional old)
 		    "^diff \\(-\\S-+ +\\)*\\(\\S-+\\)\\( +\\(\\S-+\\)\\)?"
 		    nil t)
 	       (list (if old (match-string 2) (match-string 4))
 		     (if old (match-string 4) (match-string 2)))))))))
-(defun diff-find-file-name (&optional old batch prefix)
+(defun diff-find-file-name (&optional old noprompt prefix)
 "Return the file corresponding to the current patch.
 Non-nil OLD means that we want the old file.
-Non-nil BATCH means to prefer returning an incorrect answer than to prompt
+Non-nil NOPROMPT means to prefer returning nil than to prompt the user.
-the user.
 PREFIX is only used internally: don't use it."
 (unless (equal diff-remembered-defdir default-directory)
 ;; Flush diff-remembered-files-alist if the default-directory is changed.
 (set (make-local-variable 'diff-remembered-defdir) default-directory)
 (set (make-local-variable 'diff-remembered-files-alist) nil))
 ;; attention to the PCL-CVS hint.
 (and (not prefix)
 	    (boundp 'cvs-pcl-cvs-dirchange-re)
 	    (save-excursion
 	      (re-search-backward cvs-pcl-cvs-dirchange-re nil t))
-	    (diff-find-file-name old batch (match-string 1)))
+	    (diff-find-file-name old noprompt (match-string 1)))
-;; Invent something, if necessary.
-(when batch
-(or (car fs) default-directory))
 ;; if all else fails, ask the user
-(let ((file (read-file-name (format "Use file %s: " (or (first fs) ""))
+(unless noprompt
-				   nil (first fs) t (first fs))))
+(let ((file (read-file-name (format "Use file %s: "
-	 (set (make-local-variable 'diff-remembered-files-alist)
+(or (first fs) ""))
-	      (cons (cons fs file) diff-remembered-files-alist))
+nil (first fs) t (first fs))))
-	 file)))))
+(set (make-local-variable 'diff-remembered-files-alist)
+(cons (cons fs file) diff-remembered-files-alist))
+file))))))
 (defun diff-ediff-patch ()
 "Call `ediff-patch-file' on the current buffer."
 (interactive)
 	      nil t))
 ;; add-log support
 (set (make-local-variable 'add-log-current-defun-function)
 'diff-current-defun)
 (set (make-local-variable 'add-log-buffer-file-name-function)
-'diff-find-file-name))
+(lambda () (diff-find-file-name nil 'noprompt))))
 ;;;###autoload
 (define-minor-mode diff-minor-mode
 "Minor mode for viewing/editing context diffs.
 \\{diff-minor-mode-map}"
 	(if (> (- (car forw) orig) (- orig (car back))) back forw)
 (or back forw))))
 (defsubst diff-xor (a b) (if a (if (not b) a) b))
-(defun diff-find-source-location (&optional other-file reverse)
+(defun diff-find-source-location (&optional other-file reverse noprompt)
 "Find out (BUF LINE-OFFSET POS SRC DST SWITCHED).
 BUF is the buffer corresponding to the source file.
 LINE-OFFSET is the offset between the expected and actual positions
 of the text of the hunk or nil if the text was not found.
 POS is a pair (BEG . END) indicating the position of the text in the buffer.
 SRC and DST are the two variants of text as returned by `diff-hunk-text'.
 SRC is the variant that was found in the buffer.
-SWITCHED is non-nil if the patch is already applied."
+SWITCHED is non-nil if the patch is already applied.
+NOPROMPT, if non-nil, means not to prompt the user."
 (save-excursion
 (let* ((other (diff-xor other-file diff-jump-to-old-file))
 	   (char-offset (- (point) (progn (diff-beginning-of-hunk 'try-harder)
 (point))))
 ;; Check that the hunk is well-formed.  Otherwise diff-mode and
 ;; the user may disagree on what constitutes the hunk
 ;; (e.g. because an empty line truncates the hunk mid-course),
 ;; leading to potentially nasty surprises for the user.
 (_ (diff-sanity-check-hunk))
-	   (hunk (buffer-substring (point)
+	   (hunk (buffer-substring
-				   (save-excursion (diff-end-of-hunk) (point))))
+(point) (save-excursion (diff-end-of-hunk) (point))))
 	   (old (diff-hunk-text hunk reverse char-offset))
 	   (new (diff-hunk-text hunk (not reverse) char-offset))
 	   ;; Find the location specification.
 	   (line (if (not (looking-at "\\(?:\\*\\{15\\}.*\n\\)?[-@* ]*\\([0-9,]+\\)\\([ acd+]+\\([0-9,]+\\)\\)?"))
 		     (error "Can't find the hunk header")
 		     (if (match-end 3) (match-string 3)
 		       (unless (re-search-forward
 diff-context-mid-hunk-header-re nil t)
 			 (error "Can't find the hunk separator"))
 		       (match-string 1)))))
-	   (file (or (diff-find-file-name other) (error "Can't find the file")))
+	   (file (or (diff-find-file-name other noprompt)
+(error "Can't find the file")))
 	   (buf (find-file-noselect file)))
 ;; Update the user preference if he so wished.
 (when (> (prefix-numeric-value other-file) 8)
 	(setq diff-jump-to-old-file other))
 (with-current-buffer buf
 (kill-local-variable 'change-log-default-name)
 (save-excursion
 (when (looking-at diff-hunk-header-re)
 (forward-line 1)
 (re-search-forward "^[^ ]" nil t))
-(destructuring-bind (buf line-offset pos src dst &optional switched)
+(destructuring-bind (&optional buf line-offset pos src dst switched)
-	(diff-find-source-location)
+;; Use `noprompt' since this is used in which-func-mode and such.
-(beginning-of-line)
+	(ignore-errors                ;Signals errors in place of prompting.
-(or (when (memq (char-after) '(?< ?-))
+(diff-find-source-location nil nil 'noprompt))
-	    ;; Cursor is pointing at removed text.  This could be a removed
+(when buf
-	    ;; function, in which case, going to the source buffer will
+(beginning-of-line)
-	    ;; not help since the function is now removed.  Instead,
+(or (when (memq (char-after) '(?< ?-))
-	    ;; try to figure out the function name just from the code-fragment.
+;; Cursor is pointing at removed text.  This could be a removed
-	    (let ((old (if switched dst src)))
+;; function, in which case, going to the source buffer will
-	      (with-temp-buffer
+;; not help since the function is now removed.  Instead,
-		(insert (car old))
+;; try to figure out the function name just from the
-		(funcall (buffer-local-value 'major-mode buf))
+;; code-fragment.
-		(goto-char (+ (point-min) (cdr old)))
+(let ((old (if switched dst src)))
-		(add-log-current-defun))))
+(with-temp-buffer
-	  (with-current-buffer buf
+(insert (car old))
-	    (goto-char (+ (car pos) (cdr src)))
+(funcall (buffer-local-value 'major-mode buf))
-	    (add-log-current-defun))))))
+(goto-char (+ (point-min) (cdr old)))
+(add-log-current-defun))))
+(with-current-buffer buf
+(goto-char (+ (car pos) (cdr src)))
+(add-log-current-defun)))))))
 (defun diff-ignore-whitespace-hunk ()
 "Re-diff the current hunk, ignoring whitespace differences."
 (interactive)
 (let* ((char-offset (- (point) (progn (diff-beginning-of-hunk 'try-harder)

Mercurial > emacs

comparison lisp/diff-mode.el @ 98174:841e92880f11