* doc/lispref/files.texi (Directory Names): Use \` rather than ^.

* lisp/files.el (directory-abbrev-alist): Use \` as default regexp.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 399c07d13f5c6ee6b38d3602d3ecb950b2b43903..4302da5aa270907d3d5332bb2c6d153a43200d33 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-05  Alexander Klimov  <alserkli@inbox.ru>  (tiny change)
+
+       * files.texi (Directory Names): Use \` rather than ^.
+
 2010-08-22  Chong Yidong  <cyd@stupidchicken.com>
 
        * modes.texi (Defining Minor Modes): Doc fix (Bug#6880).

diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index abdd2814b567826ab16a9d1eace9ee37b08895e3..23fd2376a5781d2ee3a73f9fed8a9275c48ba9fd 100644 (file)
--- 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 21eaa4c15d3a5d890080433dbdb92cc34a7ef15e..2d4ef5611bbcc75f5e5e760c1e014a70637684b3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,6 @@
-2010-09-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+2010-09-05  Alexander Klimov  <alserkli@inbox.ru>  (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 f6564768ae7c0fafbef2e67c3ae63c10b595b9b9..02f5f8fdacf5c6f06e6c8d388c916a0568f027a5 100644 (file)
--- 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)