diff options
| author | Kenichi Handa | 2012-02-02 18:12:08 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-02-02 18:12:08 +0900 |
| commit | ba1d2c3e9231ac0988923ed34711c20c7f013e5a (patch) | |
| tree | 56a96de4c0d099e54a133ea49e212e200e218f96 /src/ChangeLog | |
| parent | c5d3843c34587a1584b5ebcf3a693cbfe74bb5c3 (diff) | |
| parent | 953cebf5a8bde005bf7e56fd2ab31a32f32a3586 (diff) | |
| download | emacs-ba1d2c3e9231ac0988923ed34711c20c7f013e5a.tar.gz emacs-ba1d2c3e9231ac0988923ed34711c20c7f013e5a.zip | |
merge trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d291f5f4e64..7ccdca9f347 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2012-02-02 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * callproc.c (Fcall_process, Fcall_process_region): Doc fix. | ||
| 4 | |||
| 5 | * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>: | ||
| 6 | Unconditionally set to t. (Bug#10673) | ||
| 7 | * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>: | ||
| 8 | * w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>: | ||
| 9 | * xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Doc fix. | ||
| 10 | |||
| 1 | 2012-02-02 Kenichi Handa <handa@m17n.org> | 11 | 2012-02-02 Kenichi Handa <handa@m17n.org> |
| 2 | 12 | ||
| 3 | (x_produce_glyphs): Cancel previous change. If cmp->glyph_len is | 13 | (x_produce_glyphs): Cancel previous change. If cmp->glyph_len is |