Merge from emacs-24; up to 117656

1 files changed, 30 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d2cfa0dbfc3..4fb50118444 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,33 @@
+2014-11-01  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * macfont.m (macfont_glyph_extents): Turn off synthetic bold
+        if force_integral_p (i.e. no antialias).
+        (macfont_draw): Check ns_antialias_text, also turn off synthetic
+        bold if no antialias (Bug#18876).
+
+        * emacs.c (main): Don't chdir to $HOME on Cocoa if --chdir
+        was given (Bug#18846).
+
+        * nsterm.h (ns_set_doc_edited): Declare taking no args.
+
+        * nsfns.m (ns_set_doc_edited): Do all logic (check frames) here
+        instead of in xdisp.c, function now takes void. (Bug#18884).
+
+        * xdisp.c (prepare_menu_bars): Remove HAVE_NS code.
+        (redisplay_internal): Call ns_set_doc_edited if HAVE_NS (Bug#18884).
+
+        * nsterm.h (EmacsScroller): Replace Lisp_Object win with
+        struct window* (Bug#18889).
+        Remove getMouseMotionPart.
+        (ns_output): Make icon_top/left int.
+
+        * nsfns.m (x_icon): icon_top/left is int.
+
+        * nsterm.m (ns_mouse_position): Remove unused code.
+        (initFrame:window:, dealloc): Use window instead of win.
+        (getMouseMotionPart:window:x:y:): Remove, unused.
+        (sendScrollEventAtLoc:fromEvent:): Make Lisp_Object win from window.
+
 2014-11-01  Eli Zaretskii  <eliz@gnu.org>
 
         * keyboard.c (readable_events): When FLAGS include