aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/files.el7
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25880580103..7539d1c2c16 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-10-13 Richard Stallman <rms@gnu.org>
2
3 * files.el (directory-abbrev-alist): Doc fix.
4
12007-10-13 Jari Aalto <jari.aalto@cante.net> 52007-10-13 Jari Aalto <jari.aalto@cante.net>
2 6
3 * comint.el (comint-password-prompt-regexp): Add 'LDAP'. 7 * comint.el (comint-password-prompt-regexp): Add 'LDAP'.
diff --git a/lisp/files.el b/lisp/files.el
index 054f0e7d3a0..9ae4396946b 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -59,8 +59,9 @@ FROM with TO when it appears in a directory name. This replacement is
59done when setting up the default directory of a newly visited file. 59done when setting up the default directory of a newly visited file.
60*Every* FROM string should start with `^'. 60*Every* FROM string should start with `^'.
61 61
62Do not use `~' in the TO strings. 62FROM and TO should be equivalent names, which refer to the
63They should be ordinary absolute directory names. 63same directory. Do not use `~' in the TO strings;
64they should be ordinary absolute directory names.
64 65
65Use this feature when you have directories which you normally refer to 66Use this feature when you have directories which you normally refer to
66via absolute symbolic links. Make TO the name of the link, and FROM 67via absolute symbolic links. Make TO the name of the link, and FROM
@@ -554,7 +555,7 @@ See Info node `(elisp)Standard File Names' for more details."
554 (start 0)) 555 (start 0))
555 ;; Replace invalid filename characters with ! 556 ;; Replace invalid filename characters with !
556 (while (string-match "[?*:<>|\"\000-\037]" name start) 557 (while (string-match "[?*:<>|\"\000-\037]" name start)
557 (aset name (match-beginning 0) ?!) 558 (aset name (match-beginning 0) ?!)
558 (setq start (match-end 0))) 559 (setq start (match-end 0)))
559 name) 560 name)
560 filename)) 561 filename))