[Emacs-diffs] /srv/bzr/emacs/trunk r106545: * vc/diff-mode.el (diff-find-file-name): Make `read-file-name'

[Michael Albinus]

------------------------------------------------------------
revno: 106545
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Tue 2011-11-29 15:59:24 +0100
message:
  * vc/diff-mode.el (diff-find-file-name): Make `read-file-name'
  aware of remote file names.  (Bug#10124)
modified:
  lisp/ChangeLog
  lisp/vc/diff-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-11-29 06:07:51 +0000
+++ b/lisp/ChangeLog    2011-11-29 14:59:24 +0000
@@ -1,3 +1,8 @@
+2011-11-29  Michael Albinus  <address@hidden>
+
+       * vc/diff-mode.el (diff-find-file-name): Make `read-file-name'
+       aware of remote file names.  (Bug#10124)
+
 2011-11-29  Chong Yidong  <address@hidden>
 
        * frame.el (auto-raise-mode, auto-lower-mode): Doc fix.

=== modified file 'lisp/vc/diff-mode.el'
--- a/lisp/vc/diff-mode.el      2011-11-28 18:03:11 +0000
+++ b/lisp/vc/diff-mode.el      2011-11-29 14:59:24 +0000
@@ -815,9 +815,11 @@
            (diff-find-file-name old noprompt (match-string 1)))
        ;; if all else fails, ask the user
        (unless noprompt
-         (let ((file (read-file-name (format "Use file %s: "
-                                             (or (first fs) ""))
-                                     nil (first fs) t (first fs))))
+         (let ((file (expand-file-name (or (first fs) ""))))
+          (setq file
+                (read-file-name (format "Use file %s: " file)
+                                (file-name-directory file) file t
+                                (file-name-nondirectory file)))
            (set (make-local-variable 'diff-remembered-files-alist)
                 (cons (cons fs file) diff-remembered-files-alist))
            file))))))