(cd-absolute): Don't abbreviate-file-name (bug#4599).

7201bfbb · Stefan Monnier · cf885595 · 7201bfbb · 7201bfbb
Commit 7201bfbb authored Oct 01, 2009 by Stefan Monnier
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

lisp/ChangeLog lisp/ChangeLog +2 -0

lisp/files.el lisp/files.el +6 -1

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
 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
+++ b/lisp/files.el
@@ -648,7 +648,12 @@ Directories are separated by occurrences of `path-separator'
  ;; 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)