diff options
| author | Paul Eggert | 2011-04-19 07:46:13 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-19 07:46:13 -0700 |
| commit | 0a20c80c9cee34a71b975bb37ac811bd339eaf9f (patch) | |
| tree | 5dc019993c292129df8916c61ed608f0094b7b37 /src/ChangeLog | |
| parent | ec8df74431a76616a83806e1c1f4a094731a3f77 (diff) | |
| parent | 06b605171f1c9d8b42bd3326a243b8b03d2e4e58 (diff) | |
| download | emacs-0a20c80c9cee34a71b975bb37ac811bd339eaf9f.tar.gz emacs-0a20c80c9cee34a71b975bb37ac811bd339eaf9f.zip | |
Merge from mainline.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 90855341440..7a97a066f12 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -81,6 +81,14 @@ | |||
| 81 | alignof(EMACS_INT) < sizeof (EMACS_INT). | 81 | alignof(EMACS_INT) < sizeof (EMACS_INT). |
| 82 | (check_sblock, check_string_bytes, check_string_free_list): Protoize. | 82 | (check_sblock, check_string_bytes, check_string_free_list): Protoize. |
| 83 | 83 | ||
| 84 | 2011-04-19 Eli Zaretskii <eliz@gnu.org> | ||
| 85 | |||
| 86 | * syntax.h (SETUP_SYNTAX_TABLE_FOR_OBJECT): Fix setting of | ||
| 87 | gl_state.e_property when gl_state.object is Qt. | ||
| 88 | |||
| 89 | * insdel.c (make_gap_larger): Remove limitation of buffer size | ||
| 90 | to <= INT_MAX. | ||
| 91 | |||
| 84 | 2011-04-18 Chong Yidong <cyd@stupidchicken.com> | 92 | 2011-04-18 Chong Yidong <cyd@stupidchicken.com> |
| 85 | 93 | ||
| 86 | * xdisp.c (lookup_glyphless_char_display) | 94 | * xdisp.c (lookup_glyphless_char_display) |