aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorEli Zaretskii2011-01-07 17:55:13 +0200
committerEli Zaretskii2011-01-07 17:55:13 +0200
commit4320be4251090803282bcd80937342fda25b4ccb (patch)
treedd7d6e42ceaa95f2dd94ce7837f17a1850bc0b49 /doc
parentc1f04bcf73cecd5c0ca31f0c60f071db1e92054e (diff)
downloademacs-4320be4251090803282bcd80937342fda25b4ccb.tar.gz
emacs-4320be4251090803282bcd80937342fda25b4ccb.zip
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 \`.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/files.texi11
2 files changed, 12 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 1cff2853a27..bdaae56cb5c 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12011-01-07 Eli Zaretskii <eliz@gnu.org>
2
3 * files.texi (Directory Names): Explain why FROM in
4 directory-abbrev-alist should begin with \`. (Bug#7777)
5
12010-12-25 Eli Zaretskii <eliz@gnu.org> 62010-12-25 Eli Zaretskii <eliz@gnu.org>
2 7
3 * modes.texi (Emulating Mode Line): Fix last change. 8 * modes.texi (Emulating Mode Line): Fix last change.
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index c2e057783c5..f0060cd6622 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -1933,10 +1933,13 @@ The variable @code{directory-abbrev-alist} contains an alist of
1933abbreviations to use for file directories. Each element has the form 1933abbreviations to use for file directories. Each element has the form
1934@code{(@var{from} . @var{to})}, and says to replace @var{from} with 1934@code{(@var{from} . @var{to})}, and says to replace @var{from} with
1935@var{to} when it appears in a directory name. The @var{from} string is 1935@var{to} when it appears in a directory name. The @var{from} string is
1936actually a regular expression; it should always start with @samp{\`}. 1936actually a regular expression; it is matched against directory names
1937The @var{to} string should be an ordinary absolute directory name. Do 1937anchored at the first character, so it should start with @samp{\`}, to
1938not use @samp{~} to stand for a home directory in that string. The 1938support directory names with embedded newlines (which will defeat
1939function @code{abbreviate-file-name} performs these substitutions. 1939@samp{^}). The @var{to} string should be an ordinary absolute
1940directory name. Do not use @samp{~} to stand for a home directory in
1941that string. The function @code{abbreviate-file-name} performs these
1942substitutions.
1940 1943
1941You can set this variable in @file{site-init.el} to describe the 1944You can set this variable in @file{site-init.el} to describe the
1942abbreviations appropriate for your site. 1945abbreviations appropriate for your site.