aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2005-06-12 12:49:00 +0000
committerEli Zaretskii2005-06-12 12:49:00 +0000
commit0e659f576a0f6ee276a979b1fa382b2f1cfd580c (patch)
tree3eee036c6d339b4ef7dea2b6c5513473bd0cd18c
parenta1e8cad6ea6d8281cdbf7b70d20f5241329da14c (diff)
downloademacs-0e659f576a0f6ee276a979b1fa382b2f1cfd580c.tar.gz
emacs-0e659f576a0f6ee276a979b1fa382b2f1cfd580c.zip
Don't say we are dumping under 2 names on windows-nt and cygwin.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/loadup.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 40127c8510a..089682cb588 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12005-06-12 Eli Zaretskii <eliz@gnu.org> 12005-06-12 Eli Zaretskii <eliz@gnu.org>
2 2
3 * loadup.el: Don't say we are dumping under 2 names on windows-nt
4 and cygwin.
5
3 * makefile.w32-in (bootstrap-clean-CMD, bootstrap-clean-SH): Don't 6 * makefile.w32-in (bootstrap-clean-CMD, bootstrap-clean-SH): Don't
4 use an old loaddefs.el, as in Makefile.in. 7 use an old loaddefs.el, as in Makefile.in.
5 8
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 53d82323feb..f3a793b252c 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -320,7 +320,7 @@
320 (setq name (concat (downcase (substring name 0 (match-beginning 0))) 320 (setq name (concat (downcase (substring name 0 (match-beginning 0)))
321 "-" 321 "-"
322 (substring name (match-end 0))))) 322 (substring name (match-end 0)))))
323 (if (eq system-type 'ms-dos) 323 (if (memq system-type '(ms-dos windows-nt cygwin))
324 (message "Dumping under the name emacs") 324 (message "Dumping under the name emacs")
325 (message "Dumping under names emacs and %s" name))) 325 (message "Dumping under names emacs and %s" name)))
326 (condition-case () 326 (condition-case ()