master 1374f20491b: Fix the regression in dired-backup-diff's diff-goto-source behavior

[Dmitry Gutov]

branch: master
commit 1374f20491bbf0c37760cdb84f6020f80fe4eadd
Author: Dmitry Gutov <dmitry@gutov.dev>
Commit: Dmitry Gutov <dmitry@gutov.dev>

    Fix the regression in dired-backup-diff's diff-goto-source behavior
    
    * lisp/vc/diff-mode.el (diff-find-source-location): Undo part of
    the previous change, so that 'reverse' does not affect whether the
    "other file" is used (bug#62731).
    (diff-apply-hunk): Make that choice here.
---
 lisp/vc/diff-mode.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index cfa90d380ad..2ed9a4553c8 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1970,7 +1970,7 @@ SWITCHED is non-nil if the patch is already applied."
                                 diff-context-mid-hunk-header-re nil t)
                         (error "Can't find the hunk separator"))
                       (match-string 1)))))
-          (file (or (diff-find-file-name (xor other reverse) noprompt)
+          (file (or (diff-find-file-name other noprompt)
                      (error "Can't find the file")))
           (revision (and other diff-vc-backend
                           (if reverse (nth 1 diff-vc-revisions)
@@ -2047,7 +2047,7 @@ With a prefix argument, REVERSE the hunk."
                ;; TODO: make it possible to ask explicitly for this behavior.
                ;;
                ;; This is duplicated in diff-test-hunk.
-               (diff-find-source-location deletion reverse)))
+               (diff-find-source-location (xor deletion reverse) reverse)))
     (cond
      ((null line-offset)
       (user-error "Can't find the text to patch"))