diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-09-30 13:29:25 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-09-30 13:29:25 -0700 |
| commit | 3f588b57fc3f804104f60e102a04acfd104c4752 (patch) | |
| tree | 3d2722315078b090a98e6ec00fdc619ef9ea6972 | |
| parent | 535272bb73eff5a5db01301e5b60f6128d6dc788 (diff) | |
| parent | 4222c55da73988a2bf397184e46505fc9a52f8b4 (diff) | |
Merge from trunk.
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/commands.texi | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 11 |
3 files changed, 13 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index ac913fc3264..88c208ce295 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2011-09-30 Glenn Morris <rgm@gnu.org> + + * commands.texi (Keys): Whitespace fix. (Bug#9635) + 2011-09-24 Chong Yidong <cyd@stupidchicken.com> * windows.texi (Pop Up Window): Defer discussion of window diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi index 5f44e7cd076..cff725027e9 100644 --- a/doc/emacs/commands.texi +++ b/doc/emacs/commands.texi @@ -137,7 +137,7 @@ become an invalid key sequence. @xref{Key Bindings}. Typing the help character (@kbd{C-h} or @key{F1}) after a prefix key displays a list of the commands starting with that prefix. The sole -exception to this rule is @key{ESC}: @kbd{@key{ESC}C-h} is equivalent +exception to this rule is @key{ESC}: @kbd{@key{ESC} C-h} is equivalent to @kbd{C-M-h}, which does something else entirely. You can, however, use @key{F1} to displays a list of the commands starting with @key{ESC}. diff --git a/src/ChangeLog b/src/ChangeLog index 2cb49cace00..790ae712476 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -288,9 +288,6 @@ (Finsert_file_contents): Check that counts are in proper range, rather than assuming fixnums fit into ptrdiff_t etc. Don't assume fixnums fit into int. - (Fdo_auto_save, Fset_buffer_auto_saved) - (Fclear_buffer_auto_save_failure): - Don't assume time_t is signed, or that it fits in int. * floatfns.c (Fexpt): Avoid undefined signed * signed overflow. * fns.c (Fcompare_strings, Fstring_lessp, struct textprop_rec, concat) (string_char_byte_cache_charpos, string_char_byte_cache_bytepos) @@ -777,6 +774,14 @@ 2011-09-30 Paul Eggert <eggert@cs.ucla.edu> + * buffer.h (struct buffer): Use time_t, not int, for a time stamp. + This fixes a Y2038 bug on 64-bit hosts. + * buffer.c (reset_buffer): + * fileio.c (Fdo_auto_save, Fset_buffer_auto_saved) + (Fclear_buffer_auto_save_failure): + Use 0, not -1, to represent an unset failure time, since time_t + might not be signed. + Remove dependency on glibc malloc internals. * alloc.c (XMALLOC_OVERRUN_CHECK_OVERHEAD, XMALLOC_OVERRUN_CHECK_SIZE): Move back here from lisp.h, but with their new implementations. |