summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-01-28 12:29:30 -0500
committerChong Yidong <cyd@stupidchicken.com>2011-01-28 12:29:30 -0500
commit19f81ecfdea5447a02ebb58d6fe28c4b1367ddae (patch)
tree71c19ecf00c3783deec9b386c0e2c480a4323cec
parentd1f14baa30f7e2898bbfc7ea68fe93020b69a901 (diff)
downloademacs-19f81ecfdea5447a02ebb58d6fe28c4b1367ddae.tar.gz
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.
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/files.texi33
2 files changed, 20 insertions, 18 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 70cc9399a3f..4d4d38c2c5c 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-28 Chong Yidong <cyd@stupidchicken.com>
+
+ * files.texi (File Aliases): Restore explanatory text from Eli
+ Zaretskii, accidentally removed in 2011-01-08 commit.
+
2011-01-15 Chong Yidong <cyd@stupidchicken.com>
* building.texi (Compilation): Improve instructions for running two
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index b16549450e4..b5e3bff6791 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1182,26 +1182,23 @@ implies the effect of @code{find-file-existing-other-name}.
@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
-@code{directory-abbrev-alist}. Each element in this list should have
-the form @code{(@var{from} . @var{to})}, which says to replace
-@var{from} 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
-@var{to} 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
-@file{/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
+@var{from} 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
+@samp{^}). 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