diff options
| author | Miles Bader | 2007-07-31 05:50:45 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-07-31 05:50:45 +0000 |
| commit | 9899d01a0ccec166e04caa60657a44e614be50cd (patch) | |
| tree | 6f7874938065fd9808765059213ff7a94ab3268b /src/ChangeLog.6 | |
| parent | 96157d113ae5828cc280488211610db1960d572c (diff) | |
| parent | 2f12b713116a4e15b4744fc78d5f0dbb57fcd1ca (diff) | |
| download | emacs-9899d01a0ccec166e04caa60657a44e614be50cd.tar.gz emacs-9899d01a0ccec166e04caa60657a44e614be50cd.zip | |
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
Diffstat (limited to 'src/ChangeLog.6')
| -rw-r--r-- | src/ChangeLog.6 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index 4572c8c0a3a..8bf2c9a278e 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 | |||
| @@ -1643,9 +1643,9 @@ | |||
| 1643 | * emacs.c (main) [DJGPP v2]: Make standard streams use binary mode. | 1643 | * emacs.c (main) [DJGPP v2]: Make standard streams use binary mode. |
| 1644 | Call `tzset' instead of `init_gettimeofday'. | 1644 | Call `tzset' instead of `init_gettimeofday'. |
| 1645 | 1645 | ||
| 1646 | * fileio.c [MSDOS]: If DJGPP version 2, include fcntl.h and string.h. | 1646 | * fileio.c [MSDOS]: If DJGPP version 3, include fcntl.h and string.h. |
| 1647 | 1647 | ||
| 1648 | * lread.c [MSDOS]: If DJGPP version 2, include unistd.h. | 1648 | * lread.c [MSDOS]: If DJGPP version 3, include unistd.h. |
| 1649 | Include msdos.h somewhat earlier. For X_OK. | 1649 | Include msdos.h somewhat earlier. For X_OK. |
| 1650 | 1650 | ||
| 1651 | * unexec.c [DJGPP v2]: Include fcntl.h. | 1651 | * unexec.c [DJGPP v2]: Include fcntl.h. |
| @@ -1664,7 +1664,7 @@ | |||
| 1664 | (LIBS_SYSTEM, chdir, NO_MODE_T, TEXT_START, NO_MATHERR) | 1664 | (LIBS_SYSTEM, chdir, NO_MODE_T, TEXT_START, NO_MATHERR) |
| 1665 | (LOCALTIME_CACHE, tzset): Don't define if DJGPP v2. | 1665 | (LOCALTIME_CACHE, tzset): Don't define if DJGPP v2. |
| 1666 | 1666 | ||
| 1667 | * msdos.c [MSDOS]: If DJGPP version 2, include fcntl.h. | 1667 | * msdos.c [MSDOS]: If DJGPP version 3, include fcntl.h. |
| 1668 | (_crt0_startup_flags): Initialize to work | 1668 | (_crt0_startup_flags): Initialize to work |
| 1669 | correctly both with and without GNU `malloc' and `ralloc'. | 1669 | correctly both with and without GNU `malloc' and `ralloc'. |
| 1670 | (internal_terminal_init): Use only 3 bits when setting background | 1670 | (internal_terminal_init): Use only 3 bits when setting background |
| @@ -5361,7 +5361,7 @@ See ChangeLog.5 for earlier changes. | |||
| 5361 | 5361 | ||
| 5362 | GNU Emacs is free software; you can redistribute it and/or modify | 5362 | GNU Emacs is free software; you can redistribute it and/or modify |
| 5363 | it under the terms of the GNU General Public License as published by | 5363 | it under the terms of the GNU General Public License as published by |
| 5364 | the Free Software Foundation; either version 2, or (at your option) | 5364 | the Free Software Foundation; either version 3, or (at your option) |
| 5365 | any later version. | 5365 | any later version. |
| 5366 | 5366 | ||
| 5367 | GNU Emacs is distributed in the hope that it will be useful, | 5367 | GNU Emacs is distributed in the hope that it will be useful, |