diff options
| author | Eli Zaretskii | 2011-01-07 17:55:13 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-01-07 17:55:13 +0200 |
| commit | 4320be4251090803282bcd80937342fda25b4ccb (patch) | |
| tree | dd7d6e42ceaa95f2dd94ce7837f17a1850bc0b49 /lisp | |
| parent | c1f04bcf73cecd5c0ca31f0c60f071db1e92054e (diff) | |
| download | emacs-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/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 5 |
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 @@ | |||
| 1 | 2011-01-07 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * files.el (directory-abbrev-alist): Doc fix. (Bug#7777) | ||
| 4 | |||
| 1 | 2011-01-06 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2011-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." | |||
| 56 | A list of elements of the form (FROM . TO), each meaning to replace | 56 | A list of elements of the form (FROM . TO), each meaning to replace |
| 57 | FROM with TO when it appears in a directory name. This replacement is | 57 | FROM with TO when it appears in a directory name. This replacement is |
| 58 | done when setting up the default directory of a newly visited file. | 58 | done when setting up the default directory of a newly visited file. |
| 59 | *Every* FROM string should start with \"\\\\`\". | 59 | |
| 60 | FROM is matched against directory names anchored at the first | ||
| 61 | character, so it should start with a \"\\\\`\", or, if directory | ||
| 62 | names cannot have embedded newlines, with a \"^\". | ||
| 60 | 63 | ||
| 61 | FROM and TO should be equivalent names, which refer to the | 64 | FROM and TO should be equivalent names, which refer to the |
| 62 | same directory. Do not use `~' in the TO strings; | 65 | same directory. Do not use `~' in the TO strings; |