[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100426: Remove text on directory-abbrev-alist omitted in 2011-01-08 commit.

[Chong Yidong]

------------------------------------------------------------
revno: 100426
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Fri 2011-01-28 12:29:30 -0500
message:
  Remove text on directory-abbrev-alist omitted in 2011-01-08 commit.
  
  * files.texi (File Aliases): Restore explanatory text from Eli
  Zaretskii, accidentally removed in 2011-01-08 commit.
modified:
  doc/emacs/ChangeLog
  doc/emacs/files.texi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2011-01-15 03:10:38 +0000
+++ b/doc/emacs/ChangeLog       2011-01-28 17:29:30 +0000
@@ -1,3 +1,8 @@
+2011-01-28  Chong Yidong  <address@hidden>
+
+       * files.texi (File Aliases): Restore explanatory text from Eli
+       Zaretskii, accidentally removed in 2011-01-08 commit.
+
 2011-01-15  Chong Yidong  <address@hidden>
 
        * building.texi (Compilation): Improve instructions for running two

=== modified file 'doc/emacs/files.texi'
--- a/doc/emacs/files.texi      2011-01-15 02:32:19 +0000
+++ b/doc/emacs/files.texi      2011-01-28 17:29:30 +0000
@@ -1182,26 +1182,23 @@
 @cindex directory name abbreviation
 @vindex directory-abbrev-alist
   Sometimes, a directory is ordinarily accessed through a symbolic
-link, and you may want Emacs to preferentially display its ``linked''
-name instead of its truename.  To do this, customize the variable
address@hidden  Each element in this list should have
-the form @code{(@var{from} . @var{to})}, which says to replace
address@hidden with @var{to} when it appears in a directory name.  For
-this feature to work properly, @var{from} and @var{to} should point to
-the same file.  The @var{from} string is actually a regular expression
-(@pxref{Regexps}); it should always start with @samp{\`}, to avoid
-matching to an incorrect part of the original directory name.  The
address@hidden string should be an ordinary absolute directory name.  Do not
-use @samp{~} to stand for a home directory in the @var{to} string;
-Emacs performs these substitutions separately.
-
-  Here's an example, from a system on which file system
address@hidden/home/fsf} and so on are normally accessed through symbolic
-links named @file{/fsf} and so on.
+link, and you may want Emacs to preferentially show its ``linked''
+name.  To do this, customize @code{directory-abbrev-alist}.  Each
+element in this list should have the form @code{(@var{from}
+. @var{to})}, which means to replace @var{from} with @var{to} whenever
address@hidden appears in a directory name.  The @var{from} string is a
+regular expression (@pxref{Regexps}).  It is matched against directory
+names anchored at the first character, and should start with @samp{\`}
+(to support directory names with embedded newlines, which would defeat
address@hidden).  The @var{to} string should be an ordinary absolute
+directory name pointing to the same directory.  Do not use @samp{~} to
+stand for a home directory in the @var{to} string; Emacs performs
+these substitutions separately.  Here's an example, from a system on
+which @file{/home/fsf} is normally accessed through a symbolic link
+named @file{/fsf}:
 
 @example
-(("\\`/home/fsf" . "/fsf")
- ("\\`/home/gd" . "/gd"))
+(("\\`/home/fsf" . "/fsf"))
 @end example
 
 @node Directories