[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100362: Fix bug #7777 with documentation of directory-abbrev-alist.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100362
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Fri 2011-01-07 17:55:13 +0200
message:
  Fix bug #7777 with documentation of directory-abbrev-alist.
  
   lisp/files.el (directory-abbrev-alist): Doc fix.
   doc/lispref/files.texi (Directory Names): Explain why FROM in
   directory-abbrev-alist should begin with \`.
modified:
  doc/lispref/ChangeLog
  doc/lispref/files.texi
  lisp/ChangeLog
  lisp/files.el

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2011-01-02 23:50:46 +0000
+++ b/doc/lispref/ChangeLog     2011-01-07 15:55:13 +0000
@@ -1,3 +1,8 @@
+2011-01-07  Eli Zaretskii  <address@hidden>
+
+       * files.texi (Directory Names): Explain why FROM in
+       directory-abbrev-alist should begin with \`.  (Bug#7777)
+
 2010-12-25  Eli Zaretskii  <address@hidden>
 
        * modes.texi (Emulating Mode Line): Fix last change.

=== modified file 'doc/lispref/files.texi'
--- a/doc/lispref/files.texi    2011-01-02 23:50:46 +0000
+++ b/doc/lispref/files.texi    2011-01-07 15:55:13 +0000
@@ -1933,10 +1933,13 @@
 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{\`}.
-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.
+actually a regular expression; it is matched against directory names
+anchored at the first character, so it should start with @samp{\`}, to
+support directory names with embedded newlines (which will defeat
address@hidden).  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.
 
 You can set this variable in @file{site-init.el} to describe the
 abbreviations appropriate for your site.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-06 16:03:59 +0000
+++ b/lisp/ChangeLog    2011-01-07 15:55:13 +0000
@@ -1,3 +1,7 @@
+2011-01-07  Eli Zaretskii  <address@hidden>
+
+       * files.el (directory-abbrev-alist): Doc fix.  (Bug#7777)
+
 2011-01-06  Stefan Monnier  <address@hidden>
 
        * vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time):

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2011-01-02 03:57:26 +0000
+++ b/lisp/files.el     2011-01-07 15:55:13 +0000
@@ -56,7 +56,10 @@
 A list of elements of the form (FROM . TO), each meaning to replace
 FROM with TO when it appears in a directory name.  This replacement is
 done when setting up the default directory of a newly visited file.
-*Every* FROM string should start with \"\\\\`\".
+
+FROM is matched against directory names anchored at the first
+character, so it should start with a \"\\\\`\", or, if directory
+names cannot have embedded newlines, with a \"^\".
 
 FROM and TO should be equivalent names, which refer to the
 same directory.  Do not use `~' in the TO strings;