# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1157560338 0
# Node ID 06233cacfef2e55587196ccc94d8a1d74dfe6102
# Parent  c1ad5d1c9fcae60e18c7059fce62382dc3df5215
(abbreviate-file-name): Don't mistakenly match newlines in file name.

diff -r c1ad5d1c9fca -r 06233cacfef2 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Sep 06 13:01:57 2006 +0000
+++ b/lisp/ChangeLog	Wed Sep 06 16:32:18 2006 +0000
@@ -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 -r c1ad5d1c9fca -r 06233cacfef2 lisp/files.el
--- a/lisp/files.el	Wed Sep 06 13:01:57 2006 +0000
+++ b/lisp/files.el	Wed Sep 06 16:32:18 2006 +0000
@@ -1310,7 +1310,7 @@
 	  (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.