Merge from emacs-24; up to 117689

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index e3f34e27dfcf2130e95868256a981246ebc07a31..82a9b24876c572a19cf9a97e6684fef2099b7f13 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
 
        * nsterm.m (run): Only use non-system event loop if OSX version is
        exactly 10.9 (Bug#18993).
+       (ns_set_vertical_scroll_bar): Don't call bar setPosition: unless
+       needed (Bug#18757).
 
 2014-11-08  Michael Albinus  <michael.albinus@gmx.de>