aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/files.el5
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1825190c1a..546fe3c969c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12007-01-06 Eli Zaretskii <eliz@gnu.org>
2
3 * files.el (abbreviate-file-name): Doc fix.
4
52007-01-06 Markus Triska <triska@gmx.at>
6
7 * subr.el (split-string): Remove spurious ")" from doc string.
8
12007-01-05 Takaaki Ota <Takaaki.Ota@am.sony.com> 92007-01-05 Takaaki Ota <Takaaki.Ota@am.sony.com>
2 10
3 * textmodes/table.el (table--warn-incompatibility): 11 * textmodes/table.el (table--warn-incompatibility):
diff --git a/lisp/files.el b/lisp/files.el
index 7a9c1b4b9da..80df0d898d3 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1289,8 +1289,9 @@ Choose the buffer's name using `generate-new-buffer-name'."
1289 1289
1290(defun abbreviate-file-name (filename) 1290(defun abbreviate-file-name (filename)
1291 "Return a version of FILENAME shortened using `directory-abbrev-alist'. 1291 "Return a version of FILENAME shortened using `directory-abbrev-alist'.
1292This also substitutes \"~\" for the user's home directory and 1292This also substitutes \"~\" for the user's home directory (unless the
1293removes automounter prefixes (see the variable `automount-dir-prefix')." 1293home directory is a root directory) and removes automounter prefixes
1294\(see the variable `automount-dir-prefix')."
1294 ;; Get rid of the prefixes added by the automounter. 1295 ;; Get rid of the prefixes added by the automounter.
1295 (save-match-data 1296 (save-match-data
1296 (if (and automount-dir-prefix 1297 (if (and automount-dir-prefix