From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 6 Sep 2006 16:32:18 +0000 (+0000)
Subject: (abbreviate-file-name): Don't mistakenly match newlines in file name.
X-Git-Tag: emacs-pretest-22.0.90~730
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e959542d9950f0ae7d85df9811758eb7b747746c;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8fc0401d591..55fa2cf011b 100644
--- 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 0cd17932fd8..a96ba9776ef 100644
--- 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.