diff options
| author | Chong Yidong | 2011-10-01 14:46:45 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-10-01 14:46:45 -0400 |
| commit | b6bd159922608fa474026837771d63bf7eadcf97 (patch) | |
| tree | c8049a810e9e1f511ff9e79b87ba1d27803fd980 /src/ChangeLog | |
| parent | 04c52e2f5bffa157bcec3a9b1d0a57c4df36bfea (diff) | |
| parent | fa2ec41ffd2cace14f37f5d18d986b410cb038a1 (diff) | |
| download | emacs-b6bd159922608fa474026837771d63bf7eadcf97.tar.gz emacs-b6bd159922608fa474026837771d63bf7eadcf97.zip | |
Merge changes from emacs-23
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 238e3faae51..f9283730ebf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-10-01 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * keymap.c (Fsingle_key_description): Use make_specified_string | ||
| 4 | instead of build_string to build string from push_key_description. | ||
| 5 | (Bug#5193) | ||
| 6 | |||
| 1 | 2011-09-30 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2011-09-30 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 8 | ||
| 3 | * buffer.h (struct buffer): Use time_t, not int, for a time stamp. | 9 | * buffer.h (struct buffer): Use time_t, not int, for a time stamp. |