aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2002-03-30 07:57:05 +0000
committerEli Zaretskii2002-03-30 07:57:05 +0000
commit64bcea6277fa4d90ec9044567b2e7897e03faae2 (patch)
treea7dea2480df8fc47e93aebb43efc2c14d0e0b045
parentb865c14e764ad64f145fcd1e8c2040934a4c1b07 (diff)
downloademacs-64bcea6277fa4d90ec9044567b2e7897e03faae2.tar.gz
emacs-64bcea6277fa4d90ec9044567b2e7897e03faae2.zip
(command-line): Fix last change.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/startup.el3
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd45314b2af..5eb90df9ac7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12002-03-30 Eli Zaretskii <eliz@gnu.org>
2
3 * files.el (auto-save-file-name-transforms): Fix last change.
4
5 * startup.el (command-line): Fix last change.
6
12002-03-29 Richard M. Stallman <rms@gnu.org> 72002-03-29 Richard M. Stallman <rms@gnu.org>
2 8
3 * subr.el (play-sound-file): Moved to simple.el. 9 * subr.el (play-sound-file): Moved to simple.el.
diff --git a/lisp/startup.el b/lisp/startup.el
index bff519156c3..2a3ae710c6a 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -657,8 +657,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
657 (list (list "\\`/[^/]*:\\(.+/\\)*\\(.*\\)" 657 (list (list "\\`/[^/]*:\\(.+/\\)*\\(.*\\)"
658 ;; Don't put "\\2" inside expand-file-name, since 658 ;; Don't put "\\2" inside expand-file-name, since
659 ;; it will be transformed to "/2" on DOS/Windows. 659 ;; it will be transformed to "/2" on DOS/Windows.
660 (concat (expand-file-name temporary-file-directory) 660 (concat temporary-file-directory "\\2"))))
661 "\\2"))))
662 661
663 ;; See if we should import version-control from the environment variable. 662 ;; See if we should import version-control from the environment variable.
664 (let ((vc (getenv "VERSION_CONTROL"))) 663 (let ((vc (getenv "VERSION_CONTROL")))