From 3fa0dc8f4dcf7142f23668cceb39435eea8de6e5 Mon Sep 17 00:00:00 2001 From: Alexander Klimov Date: Mon, 6 Sep 2010 00:03:56 +0200 Subject: [PATCH] * doc/lispref/files.texi (Directory Names): Use \` rather than ^. * lisp/files.el (directory-abbrev-alist): Use \` as default regexp. --- doc/lispref/ChangeLog | 4 ++++ doc/lispref/files.texi | 8 ++++---- lisp/ChangeLog | 4 +++- lisp/files.el | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 399c07d13f5..4302da5aa27 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2010-09-05 Alexander Klimov (tiny change) + + * files.texi (Directory Names): Use \` rather than ^. + 2010-08-22 Chong Yidong * modes.texi (Defining Minor Modes): Doc fix (Bug#6880). diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index abdd2814b56..23fd2376a57 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -1933,7 +1933,7 @@ The variable @code{directory-abbrev-alist} contains an alist of abbreviations to use for file directories. Each element has the form @code{(@var{from} . @var{to})}, and says to replace @var{from} with @var{to} when it appears in a directory name. The @var{from} string is -actually a regular expression; it should always start with @samp{^}. +actually a regular expression; it should always start with @samp{\`}. The @var{to} string should be an ordinary absolute directory name. Do not use @samp{~} to stand for a home directory in that string. The function @code{abbreviate-file-name} performs these substitutions. @@ -1946,9 +1946,9 @@ and so on are normally accessed through symbolic links named @file{/fsf} and so on. @example -(("^/home/fsf" . "/fsf") - ("^/home/gp" . "/gp") - ("^/home/gd" . "/gd")) +(("\\`/home/fsf" . "/fsf") + ("\\`/home/gp" . "/gp") + ("\\`/home/gd" . "/gd")) @end example @end defopt diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 21eaa4c15d3..2d4ef5611bb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,4 +1,6 @@ -2010-09-05 Stefan Monnier +2010-09-05 Alexander Klimov (tiny change) + + * files.el (directory-abbrev-alist): Use \` as default regexp. * emacs-lisp/rx.el (rx-any): Don't explode ranges that end in special chars like - or ] (bug#6984). diff --git a/lisp/files.el b/lisp/files.el index f6564768ae7..02f5f8fdacf 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -66,9 +66,9 @@ Use this feature when you have directories which you normally refer to via absolute symbolic links. Make TO the name of the link, and FROM the name it is linked to." :type '(repeat (cons :format "%v" - :value ("" . "") + :value ("\\`" . "") (regexp :tag "From") - (regexp :tag "To"))) + (string :tag "To"))) :group 'abbrev :group 'find-file)