mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/vc/diff-mode.el (diff-find-source-location): Use vc-working-revision

Browse source 
when diff shows changes in working revision.  (Bug#33319)
(diff-goto-source): Rename variables to avoid ambiguity.
This commit is contained in:
Juri Linkov 2018-11-17 23:52:05 +02:00
parent 8a481d2970
commit 5d14080039
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/vc/diff-mode.el
View file

@ -1742,7 +1742,10 @@ NOPROMPT, if non-nil, means not to prompt the user."
(file (or (diff-find-file-name other noprompt)
(error "Can't find the file")))
(revision (and other diff-vc-backend
(nth (if reverse 1 0) diff-vc-revisions)))
(if reverse (nth 1 diff-vc-revisions)
(or (nth 0 diff-vc-revisions)
;; When diff shows changes in working revision
(vc-working-revision file)))))
(buf (if revision
(let ((vc-find-revision-no-save t))
(vc-find-revision file revision diff-vc-backend))
@ -1883,13 +1886,13 @@ revision of the file otherwise."
;; This is a convenient detail when using smerge-diff.
(if event (posn-set-point (event-end event)))
(let ((buffer (when event (current-buffer)))
(rev (not (save-excursion (beginning-of-line) (looking-at "[-<]")))))
(reverse (not (save-excursion (beginning-of-line) (looking-at "[-<]")))))
(pcase-let ((`(,buf ,line-offset ,pos ,src ,_dst ,switched)
(diff-find-source-location other-file rev)))
(diff-find-source-location other-file reverse)))
(pop-to-buffer buf)
(goto-char (+ (car pos) (cdr src)))
(when buffer (next-error-found buffer (current-buffer)))
(diff-hunk-status-msg line-offset (diff-xor rev switched) t))))
(diff-hunk-status-msg line-offset (diff-xor reverse switched) t))))
(defun diff-current-defun ()