procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Stefan Monnier 2006-09-06 16:32:18 +00:00
parent bdd26918c5
commit e959542d99
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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> 2006-09-06 Ralf Angeli <angeli@caeruleus.net>
* frame.el (display-mm-dimensions-alist): New defcustom. * frame.el (display-mm-dimensions-alist): New defcustom.

2
lisp/files.el
View file

@ -1310,7 +1310,7 @@ removes automounter prefixes (see the variable `automount-dir-prefix')."
(setq abbreviated-home-dir (setq abbreviated-home-dir
(let ((abbreviated-home-dir "$foo")) (let ((abbreviated-home-dir "$foo"))
(concat "^" (abbreviate-file-name (expand-file-name "~")) (concat "^" (abbreviate-file-name (expand-file-name "~"))
"\\(/\\|$\\)")))) "\\(/\\|\\'\\)"))))
;; If FILENAME starts with the abbreviated homedir, ;; If FILENAME starts with the abbreviated homedir,
;; make it start with `~' instead. ;; make it start with `~' instead.