Mercurial > emacs

diff src/ChangeLog.6 @ 83648:65663fcd2caa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 824-838) - Update from CVS - Merge from emacs--rel--22 - Remove lisp/erc/erc-nicklist.el - Update some .arch-inventory files - Fix void function definition error in cus-edit.el - Restore lisp/emacs-lisp/cl-loaddefs.el * emacs--rel--22 (patch 70-83) - Update from CVS - Remove lisp/erc/erc-nicklist.el - Update some .arch-inventory files - Indicate that emacs--devo--0--patch-834 does not need to be applied - Merge from gnus--rel--5.10 - Restore lisp/emacs-lisp/cl-loaddefs.el * gnus--rel--5.10 (patch 239-241) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-28
author Miles Bader <miles@gnu.org>
date Tue, 31 Jul 2007 05:50:45 +0000
parents 922696f363b0
children fc2bcd2a8aad f55f9811f5d7
line wrap: on
line diff
--- a/src/ChangeLog.6	Mon Jul 30 04:59:04 2007 +0000
+++ b/src/ChangeLog.6	Tue Jul 31 05:50:45 2007 +0000
@@ -1643,9 +1643,9 @@
 	* emacs.c (main) [DJGPP v2]: Make standard streams use binary mode.
 	Call `tzset' instead of `init_gettimeofday'.
 
-	* fileio.c [MSDOS]: If DJGPP version 2, include fcntl.h and string.h.
-
-	* lread.c [MSDOS]: If DJGPP version 2, include unistd.h.
+	* fileio.c [MSDOS]: If DJGPP version 3, include fcntl.h and string.h.
+
+	* lread.c [MSDOS]: If DJGPP version 3, include unistd.h.
 	Include msdos.h somewhat earlier.  For X_OK.
 
 	* unexec.c [DJGPP v2]: Include fcntl.h.
@@ -1664,7 +1664,7 @@
 	(LIBS_SYSTEM, chdir, NO_MODE_T, TEXT_START, NO_MATHERR)
 	(LOCALTIME_CACHE, tzset): Don't define if DJGPP v2.
 
-	* msdos.c [MSDOS]: If DJGPP version 2, include fcntl.h.
+	* msdos.c [MSDOS]: If DJGPP version 3, include fcntl.h.
 	(_crt0_startup_flags): Initialize to work
 	correctly both with and without GNU `malloc' and `ralloc'.
 	(internal_terminal_init): Use only 3 bits when setting background
@@ -5361,7 +5361,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,