aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Brown2010-12-17 10:14:57 -0500
committerKen Brown2010-12-17 10:14:57 -0500
commit2e306b392b3d517bcbee818e2be1335fce012d48 (patch)
treeb0ea2a41c14fdba02831457229714be184cd8fe4
parent395542c68d4ba3c49459291456624d607365ebb5 (diff)
downloademacs-2e306b392b3d517bcbee818e2be1335fce012d48.tar.gz
emacs-2e306b392b3d517bcbee818e2be1335fce012d48.zip
* loadup.el: Use version numbers in Cygwin build.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/loadup.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 862c68273fd..09911f22e97 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-12-17 Ken Brown <kbrown@cornell.edu>
2
3 * loadup.el: Use version numbers in Cygwin build.
4
12010-12-17 Ryan Twitchell <metatheorem@gmail.com> (tiny change) 52010-12-17 Ryan Twitchell <metatheorem@gmail.com> (tiny change)
2 6
3 * ido.el (ido-file-internal): Ask for confirmation before 7 * ido.el (ido-file-internal): Ask for confirmation before
diff --git a/lisp/loadup.el b/lisp/loadup.el
index fb3aaff37c1..d7fc63d0692 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -342,7 +342,7 @@
342 (dump-emacs "emacs" "temacs") 342 (dump-emacs "emacs" "temacs")
343 (message "%d pure bytes used" pure-bytes-used) 343 (message "%d pure bytes used" pure-bytes-used)
344 ;; Recompute NAME now, so that it isn't set when we dump. 344 ;; Recompute NAME now, so that it isn't set when we dump.
345 (if (not (or (memq system-type '(ms-dos windows-nt cygwin)) 345 (if (not (or (memq system-type '(ms-dos windows-nt))
346 ;; Don't bother adding another name if we're just 346 ;; Don't bother adding another name if we're just
347 ;; building bootstrap-emacs. 347 ;; building bootstrap-emacs.
348 (equal (nth 3 command-line-args) "bootstrap") 348 (equal (nth 3 command-line-args) "bootstrap")