mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-18 11:50:38 -08:00
Code Issues Projects Releases Wiki Activity

* vc/diff-mode.el (diff-find-file-name): Make `read-file-name'

Browse source 
aware of remote file names.  (Bug#10124)
This commit is contained in:
Michael Albinus 2011-11-29 15:59:24 +01:00
parent ed472be992
commit f3af92b794
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
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> 2011-11-29 Chong Yidong <cyd@gnu.org>
* frame.el (auto-raise-mode, auto-lower-mode): Doc fix. * frame.el (auto-raise-mode, auto-lower-mode): Doc fix.

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

@ -815,9 +815,11 @@ PREFIX is only used internally: don't use it."
(diff-find-file-name old noprompt (match-string 1))) (diff-find-file-name old noprompt (match-string 1)))
;; if all else fails, ask the user ;; if all else fails, ask the user
(unless noprompt (unless noprompt
(let ((file (read-file-name (format "Use file %s: " (let ((file (expand-file-name (or (first fs) ""))))
(or (first fs) "")) (setq file
nil (first fs) t (first fs)))) (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) (set (make-local-variable 'diff-remembered-files-alist)
(cons (cons fs file) diff-remembered-files-alist)) (cons (cons fs file) diff-remembered-files-alist))
file)))))) file))))))