merge trunk

1 files changed, 62 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 956e78e6c7e..492b966a256 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,65 @@
+2012-10-07  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (ns_dumpglyphs_image): Only draw slize of image (Bug#12506).
+
+        * nsterm.m (ns_update_auto_hide_menu_bar): Remove defintion of
+        MAC_OS_X_VERSION_10_6.
+        (syms_of_nsterm): Remove comment about Panther and above for ns-antialias-text.
+        * nsterm.h (MAC_OS_X_VERSION_10_3, onTiger): Remove.
+        (EmacsApp): Remove check for >= MAC_OS_X_VERSION_10_4.
+        (struct nsfont_info): Remove check for >= MAC_OS_X_VERSION_10_3.
+
+        * nsselect.m (ns_string_from_pasteboard): Remove check for >=
+        MAC_OS_X_VERSION_10_4.
+
+        * nsmenu.m (fillWithWidgetValue:): Remove code for < MAC_OS_X_VERSION_10_2.
+
+        * nsimage.m (setPixmapData, getPixelAtX, setAlphaAtX): Remove onTiger.
+
+        * nsfns.m (Fns_list_services): Remove comment and check for OSX < 10.4.
+        (ns_do_applescript): Remove check for >= MAC_OS_X_VERSION_10_4.
+
+        * nsterm.m (ns_in_resize): Remove (Bug#12479).
+        (ns_resize_handle_rect, mouseDown, mouseUp, mouseDragged): Remove.
+        (ns_clear_frame, sendEvent, windowDidResize, drawRect:): Remove ns_in_resize
+        check.
+        (ns_clear_frame_area): Remove resize handle code.
+
+        * nsfns.m (ns_in_resize): Remove.
+        (x_set_icon_name, ns_set_name, ns_set_name_as_filename):  Remove ns_in_resize
+        check.
+
+2012-10-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Improve sys_siglist detection.
+        * sysdep.c (sys_siglist, init_signals): Use _sys_siglist if it's
+        defined as a macro, as is done in Solaris.
+        (sys_siglist_entries): New macro.
+        (save_strsignal): Use it.
+        * syssignal.h (safe_strsignal): Now ATTRIBUTE_CONST, to pacify
+        GCC 4.7.2 on Fedora 17 with the fixed sys_siglist detection.
+
+2012-10-06  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsfns.m (Fx_create_frame): Call x_default_parameter with
+        fullscreen/Fullscreen.
+
+        * nsterm.h (EmacsView): Rename tbar_height to tibar_height.
+        tobar_height is new.
+
+        * nsterm.m (x_make_frame_visible): Check for fullscreen.
+        (ns_fullscreen_hook): Activate old style fullscreen with a timer.
+        (ns_term_init): Set activateIgnoringOtherApps if old style fullscreen.
+        (windowDidResize:): Check for correct window if old style fullscreen.
+        Capitalize word in comment.  Remove incorrect comment.
+        (initFrameFromEmacs:): tbar_height renamed tibar_height.
+        (windowDidEnterFullScreen:): Toggle toolbar for fullscreen to fix
+        error in drawing background.
+        (toggleFullScreen:): Remove comment. Rearrange calls.
+        Set toolbar values to zero, save old height in tobar_height.
+        Restore tool bar height when leaving fullscreen.
+        (canBecomeMainWindow): New function.
+
 2012-10-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         * keyboard.c (read_char): Remove unnecessary 'volatile's and label.