diff options
| author | Glenn Morris | 2014-11-09 23:39:35 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-11-09 23:39:35 -0800 |
| commit | c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe (patch) | |
| tree | 98a77f1acdac589d1be95dea128af1af7e8dc286 /src/ChangeLog | |
| parent | eca1ea96559e04e18a62a61208d501c557dd4cab (diff) | |
| parent | edfdb22f674312389ccf5d5e37efa4d3f1516994 (diff) | |
| download | emacs-c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe.tar.gz emacs-c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe.zip | |
Merge from emacs-24; up to 117698
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b51f3c15a66..d44de652dde 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,17 @@ | |||
| 1 | 2014-11-10 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * fileio.c (Finsert_file_contents): Invalidate buffer caches also | ||
| 4 | when the inserted text does not need decoding. (Bug#18982) | ||
| 5 | |||
| 6 | 2014-11-10 Jan Djärv <jan.h.d@swipnet.se> | ||
| 7 | |||
| 8 | * nsterm.h (EmacsScroller): judge returns bool. | ||
| 9 | |||
| 10 | * nsterm.m (ns_set_vertical_scroll_bar): Release bar. | ||
| 11 | (ns_judge_scroll_bars): Only set removed if judge returns true. | ||
| 12 | (judge): Returns bool == condemned. Remove self from window. | ||
| 13 | (setPosition:portion:whole:): Remove raise SIGIO (Bug#18757). | ||
| 14 | |||
| 1 | 2014-11-10 Stefan Monnier <monnier@iro.umontreal.ca> | 15 | 2014-11-10 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 16 | ||
| 3 | * keyboard.c (command_loop_1): Record this-command in recent-keys. | 17 | * keyboard.c (command_loop_1): Record this-command in recent-keys. |