Mercurial > emacs
changeset 105330:7660578a04ee
(cd-absolute): Don't abbreviate-file-name (bug#4599).
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 01 Oct 2009 03:34:04 +0000 |
| parents | fa9bcb68092e |
| children | 7fbcb0722b78 |
| files | lisp/ChangeLog lisp/files.el |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Oct 01 03:32:25 2009 +0000 +++ b/lisp/ChangeLog Thu Oct 01 03:34:04 2009 +0000 @@ -1,5 +1,7 @@ 2009-10-01 Stefan Monnier <monnier@iro.umontreal.ca> + * files.el (cd-absolute): Don't abbreviate-file-name (bug#4599). + * vc-dispatcher.el (vc-resynch-window): Don't revert a buffer which has no associated file. (vc-resynch-buffer): Use vc-dir-buffers.
--- a/lisp/files.el Thu Oct 01 03:32:25 2009 +0000 +++ b/lisp/files.el Thu Oct 01 03:34:04 2009 +0000 @@ -648,7 +648,12 @@ ;; Put the name into directory syntax now, ;; because otherwise expand-file-name may give some bad results. (setq dir (file-name-as-directory dir)) - (setq dir (abbreviate-file-name (expand-file-name dir))) + ;; We used to additionally call abbreviate-file-name here, for an + ;; unknown reason. Problem is that most buffers are setup + ;; without going through cd-absolute and don't call + ;; abbreviate-file-name on their default-directory, so the few that + ;; do end up using a superficially different directory. + (setq dir (expand-file-name dir)) (if (not (file-directory-p dir)) (if (file-exists-p dir) (error "%s is not a directory" dir)