(vc-diff-switches): New user option.

[gnu-emacs] / lisp / ediff-ptch.el

diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el
index 873e45060e02155381c0c357c6bba9f9ea571bce..18b2f75b4df00bd1bdf78e87ecc99bbe275ed562 100644 (file)
--- a/lisp/ediff-ptch.el
+++ b/lisp/ediff-ptch.el
@@ -427,7 +427,7 @@ are two possible targets for this patch.  However, these files do not exist."
 (defun ediff-prompt-for-patch-buffer ()
   (get-buffer
    (read-buffer
-    "Patch is in buffer: "
+    "Buffer that holds the patch: "
     (cond ((save-excursion
             (goto-char (point-min))
             (re-search-forward ediff-context-diff-label-regexp nil t))
@@ -444,7 +444,7 @@ are two possible targets for this patch.  However, these files do not exist."
               (goto-char (point-min))
               (and (re-search-forward ediff-context-diff-label-regexp nil t)
                    (current-buffer)))))
-         (t nil))
+         (t (other-buffer (current-buffer) 'visible-ok)))
     'must-match)))