+2011-11-29 Michael Albinus <michael.albinus@gmx.de>
+
+ * vc/diff-mode.el (diff-find-file-name): Make `read-file-name'
+ aware of remote file names. (Bug#10124)
+
2011-11-29 Chong Yidong <cyd@gnu.org>
* frame.el (auto-raise-mode, auto-lower-mode): Doc fix.
(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))))))