[Emacs-diffs] emacs/lisp ChangeLog files.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/10/01 03:34:08

Modified files:
        lisp           : ChangeLog files.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16310&r2=1.16311
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1087&r2=1.1088

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16310
retrieving revision 1.16311
diff -u -b -r1.16310 -r1.16311
--- ChangeLog   1 Oct 2009 03:32:25 -0000       1.16310
+++ ChangeLog   1 Oct 2009 03:34:04 -0000       1.16311
@@ -1,5 +1,7 @@
 2009-10-01  Stefan Monnier  <address@hidden>
 
+       * 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.

Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.1087
retrieving revision 1.1088
diff -u -b -r1.1087 -r1.1088
--- files.el    29 Sep 2009 23:57:20 -0000      1.1087
+++ files.el    1 Oct 2009 03:34:07 -0000       1.1088
@@ -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)