aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2011-01-07 17:55:13 +0200
committerEli Zaretskii2011-01-07 17:55:13 +0200
commit4320be4251090803282bcd80937342fda25b4ccb (patch)
treedd7d6e42ceaa95f2dd94ce7837f17a1850bc0b49 /lisp
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 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/files.el5
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b72e41e9ad..3f0f8e85271 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-01-07 Eli Zaretskii <eliz@gnu.org>
2
3 * files.el (directory-abbrev-alist): Doc fix. (Bug#7777)
4
12011-01-06 Stefan Monnier <monnier@iro.umontreal.ca> 52011-01-06 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time): 7 * vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time):
diff --git a/lisp/files.el b/lisp/files.el
index 690caf13960..ab027b507f6 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -56,7 +56,10 @@ when it has unsaved changes."
56A list of elements of the form (FROM . TO), each meaning to replace 56A list of elements of the form (FROM . TO), each meaning to replace
57FROM with TO when it appears in a directory name. This replacement is 57FROM with TO when it appears in a directory name. This replacement is
58done when setting up the default directory of a newly visited file. 58done when setting up the default directory of a newly visited file.
59*Every* FROM string should start with \"\\\\`\". 59
60FROM is matched against directory names anchored at the first
61character, so it should start with a \"\\\\`\", or, if directory
62names cannot have embedded newlines, with a \"^\".
60 63
61FROM and TO should be equivalent names, which refer to the 64FROM and TO should be equivalent names, which refer to the
62same directory. Do not use `~' in the TO strings; 65same directory. Do not use `~' in the TO strings;