Merge from emacs-24; up to 117698

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index b51f3c15a66fe8f61b47f726ac493c166a5c6c73..d44de652dde0b3aaddf682ed80bfbd20f70dbf4d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2014-11-10  Eli Zaretskii  <eliz@gnu.org>
+
+       * fileio.c (Finsert_file_contents): Invalidate buffer caches also
+       when the inserted text does not need decoding.  (Bug#18982)
+
+2014-11-10  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsterm.h (EmacsScroller): judge returns bool.
+
+       * nsterm.m (ns_set_vertical_scroll_bar): Release bar.
+       (ns_judge_scroll_bars): Only set removed if judge returns true.
+       (judge): Returns bool == condemned.  Remove self from window.
+       (setPosition:portion:whole:): Remove raise SIGIO (Bug#18757).
+
 2014-11-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * keyboard.c (command_loop_1): Record this-command in recent-keys.