(abbreviate-file-name): Don't mistakenly match newlines in file name.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8fc0401d5910c87c527de3dc7d40d424dbc6ed73..55fa2cf011bb5f4d80b510ea0faa8e1b1ae0dfbe 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * files.el (abbreviate-file-name): Don't mistakenly match newlines in
+       file name.
+
 2006-09-06  Ralf Angeli  <angeli@caeruleus.net>
 
        * frame.el (display-mm-dimensions-alist): New defcustom.

diff --git a/lisp/files.el b/lisp/files.el
index 0cd17932fd8cb867d086ccf25dc87485b39fefed..a96ba9776ef71f5d818d8ee72d11df7853b0ee7a 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1310,7 +1310,7 @@ removes automounter prefixes (see the variable `automount-dir-prefix')."
          (setq abbreviated-home-dir
                (let ((abbreviated-home-dir "$foo"))
                  (concat "^" (abbreviate-file-name (expand-file-name "~"))
-                         "\\(/\\|$\\)"))))
+                         "\\(/\\|\\'\\)"))))
 
       ;; If FILENAME starts with the abbreviated homedir,
       ;; make it start with `~' instead.