Merge from trunk.

17 files changed, 170 insertions, 62 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e67fdada36f..0970bf62b52 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,66 @@
+2013-12-09  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]:
+        Avoid unused macro warning if configured --without-xft.
+
+2013-12-09  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * alloc.c (Fmemory_limit): Avoid compiler warning.  Return 0 always.
+
+2013-12-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (updateFrameSize:): Fix GNUStep toolbar not updating.
+
+        * emacs.c (main): Call fixup_locale a second time for GNUStep.
+
+2013-12-08  Martin Rudalics  <rudalics@gmx.at>
+
+        * frame.c (x_set_font): Mark frame as garbaged (Bug#16028).
+
+2013-12-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use libcrypto's checksum implementations if available, for speed.
+        * Makefile.in (LIB_CRYPTO): New macro.
+        (LIBES): Use it.
+
+        * frame.h (SET_FRAME_VISIBLE): Now an inline function.
+        The macro didn't conform to C99 due to type mismatch,
+        which caused compilation failure with Sun C 5.12,
+        and it was confusing anyway.  Include window.h to declare
+        redisplay_other_windows.
+
+2013-12-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.c (set_window_buffer): Update mode line (bug#16084).
+
+2013-12-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix minor problems found by static checking.
+        * keyboard.c (poll_for_input_1, input_polling_used):
+        Define only if HAVE_NTGUI.
+        * xmenu.c (popup_activate_callback): Omit unnecessary
+        check against USE_X_TOOLKIT, which must be defined here anyway.
+        * xterm.c, xterm.h (x_dispatch_event) [! (USE_X_TOOLKIT || USE_MOTIF)]:
+        Now static.
+
+2013-12-07  Martin Rudalics  <rudalics@gmx.at>
+
+        * w32term.c (w32_read_socket): Fix int/Lisp_Object type mixup.
+
 2013-12-07  Jan Djärv  <jan.h.d@swipnet.se>
 
+        * gtkutil.c (tb_size_cb): Call xg_height_or_width_changed.
+
+        * nsterm.m (x_set_window_size): Remove fprintf.
+        (init): Define always.  Set applicationDidFinishLaunchingCalled
+        for GNUStep.
+        (applicationDidFinishLaunching:):
+        Set applicationDidFinishLaunchingCalled.
+        (applicationDidBecomeActive:): Call applicationDidFinishLaunching if
+        not called.
+
+        * nsterm.h (EmacsApp): Add applicationDidFinishLaunchingCalled.
+
         Pixel resize changes for NS (Bug#16049).
         * nsterm.m (x_set_window_size): Change parameters rows/cols to
         height/width.  row/cols are locals.
@@ -7,8 +68,8 @@
         (updateFrameSize:): Remove gsextra.  Adjust for pixelwise resize.
         (windowWillResize): Remove gsextra.  Calculate extra as in
         updateFrameSize.
-        (x_new_font): Don't change frame size if fullscreen.  Change
-        size pixelwise.
+        (x_new_font): Don't change frame size if fullscreen.
+        Change size pixelwise.
 
         * nsfns.m (Fx_create_frame): Call change_frame_size twice as per
         comment in xfns.c.  Change to pixelwise call.
@@ -210,8 +271,8 @@
         ON_RIGHT_DIVIDER and ON_BOTTOM_DIVIDER.
         (struct glyph_matrix): Replace window_left_col and
         window_top_line by window_pixel_left and window_pixel_top.
-        (WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P): Minor
-        rewrite.
+        (WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P):
+        Minor rewrite.
         (enum face_id): Add WINDOW_DIVIDER_FACE_ID.
         (draw_window_divider, move_it_to, x_draw_right_divider)
         (x_draw_bottom_divider, change_frame_size): Add or fix
@@ -226,8 +287,8 @@
         (init_display): Adjusts calls of change_frame_size.
         (change_frame_size, change_frame_size_1): Handle pixelwise
         changes.
-        * frame.c (Qright_divider_width, Qbottom_divider_width): New
-        Lisp objects.
+        * frame.c (Qright_divider_width, Qbottom_divider_width):
+        New Lisp objects.
         (set_menu_bar_lines_1, set_menu_bar_lines, make_frame)
         (make_terminal_frame, Fmake_terminal_frame, Fframe_parameters)
         (x_set_internal_border_width, x_set_vertical_scroll_bars)
@@ -238,15 +299,15 @@
         (Fframe_text_width, Fframe_text_height, Fscroll_bar_width)
         (Ffringe_width, Fborder_width, Fright_divider_width)
         (Fbottom_divider_width): New functions, defsubr them.
-        (Fset_frame_height, Fset_frame_width, Fset_frame_size): New
-        argument pixelwise.
+        (Fset_frame_height, Fset_frame_width, Fset_frame_size):
+        New argument pixelwise.
         (struct frame_parm_table): New members Qright_divider_width and
         Qbottom_divider_width.
         (x_set_frame_parameters): Handle parameters for pixelwise sizes.
         (x_report_frame_params): Handle Qright_divider_width and
         Qbottom_divider_width.
-        (x_set_right_divider_width, x_set_bottom_divider_width): New
-        functions.
+        (x_set_right_divider_width, x_set_bottom_divider_width):
+        New functions.
         (frame_resize_pixelwise): New option.
         * frame.h (struct frame): Add tool_bar_height, menu_bar_height,
         new_pixelwise, right_divider_width and bottom_divider_width;
@@ -257,8 +318,8 @@
         FRAME_TEXT_WIDTH respectively.
         (FRAME_MENU_BAR_HEIGHT, FRAME_TOOL_BAR_HEIGHT)
         (FRAME_RIGHT_DIVIDER_WIDTH, FRAME_BOTTOM_DIVIDER_WIDTH)
-        (FRAME_TEXT_TO_PIXEL_WIDTH, FRAME_PIXEL_TO_TEXT_WIDTH): New
-        macros.
+        (FRAME_TEXT_TO_PIXEL_WIDTH, FRAME_PIXEL_TO_TEXT_WIDTH):
+        New macros.
         (FRAME_TOP_MARGIN_HEIGHT, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH)
         (FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH, FRAME_SCROLL_BAR_AREA_WIDTH)
         (SET_FRAME_COLS, SET_FRAME_WIDTH, SET_FRAME_HEIGHT)
@@ -268,8 +329,8 @@
         * fringe.c (draw_fringe_bitmap_1): Handle right divder.
         * gtkutil.c (xg_frame_resized, xg_frame_set_char_size)
         (x_wm_set_size_hint): Handle frame pixel sizes.
-        * indent.c (compute_motion, Fcompute_motion): Call
-        window_body_width instead of window_body_cols.
+        * indent.c (compute_motion, Fcompute_motion):
+        Call window_body_width instead of window_body_cols.
         * keyboard.c (Qright_divider, Qbottom_divider): New symbols.
         (make_lispy_position): Handle right and bottom dividers.
         (Fsuspend_emacs): Pixelize call of change_frame_size.
@@ -277,13 +338,13 @@
         * lisp.h: Extern set_frame_param.
         * nsfns.m (x_set_tool_bar_lines): Pixelize call of
         x_set_window_size.
-        (Fx_create_frame): Add entry for vertical_drag_cursor.  Pixelize
-        call of change_frame_size.
+        (Fx_create_frame): Add entry for vertical_drag_cursor.
+        Pixelize call of change_frame_size.
         * nsterm.h (struct ns_output): Add vertical_drag_cursor.
         * nsterm.m (ns_update_window_end): Optionally draw right
         divider.
-        (x_set_window_size): Add argument pixelwise.  Call
-        check_frame_size and change_frame_size with pixelwise zero.
+        (x_set_window_size): Add argument pixelwise.
+        Call check_frame_size and change_frame_size with pixelwise zero.
         (ns_draw_window_divider): New function.
         (ns_redisplay_interface): Add ns_draw_window_divider.
         (updateFrameSize:): Call change_frame_size with pixelwise zero.
@@ -294,12 +355,12 @@
         * w32fns.c (x_set_mouse_color): Handle vertical drag cursor.
         (x_set_menu_bar_lines, x_set_tool_bar_lines): Calculate pixelwise.
         (w32_createwindow): Use scroll bar area width.
-        (w32_wnd_proc): Handle bottom divider width.  For
-        WM_WINDOWPOSCHANGING return zero if we resize pixelwise.
-        (Fx_create_frame): Default divider width parameters.  Caclulate
-        sizes pixelwise.  Add vertical drag cursor support.
-        (x_create_tip_frame): Default divider widths to zero.  Pixelize
-        call to change_frame_size.
+        (w32_wnd_proc): Handle bottom divider width.
+        For WM_WINDOWPOSCHANGING return zero if we resize pixelwise.
+        (Fx_create_frame): Default divider width parameters.
+        Caclulate sizes pixelwise.  Add vertical drag cursor support.
+        (x_create_tip_frame): Default divider widths to zero.
+        Pixelize call to change_frame_size.
         (Fx_show_tip): Add handling of divider widths.  Pixelize window
         position and sizes.
         (Fw32_frame_rect): New function.
@@ -314,8 +375,8 @@
         (x_update_window_end): Handle right divider.
         (w32_draw_fringe_bitmap, x_scroll_run)
         (w32_set_vertical_scroll_bar): Pixelize scrollbar widths.
-        (w32_read_socket): Handle SIZE_MAXIMIZED separately.  Calculate
-        new frame sizes pixelwise.
+        (w32_read_socket): Handle SIZE_MAXIMIZED separately.
+        Calculate new frame sizes pixelwise.
         (x_new_font): Pixelize call to x_set_window_size.
         (x_check_fullscreen): Pixelize call to change_frame_size.
         (x_set_window_size_1, x_set_window_size): New argument
@@ -334,16 +395,16 @@
         (Fset_window_new_pixel, window_resize_apply_total)
         (Fwindow_resize_apply_total): New functions.
         (window_body_height, window_body_width): Rename from
-        window_body_lines.  New argument PIXELWISE.  Calculate
-        pixelwise.
+        window_body_lines.  New argument PIXELWISE.
+        Calculate pixelwise.
         (Fwindow_body_height, Fwindow_body_width): New argument
         PIXELWISE.
         (coordinates_in_window, window_relative_x_coord): Use window's
         pixel width instead of total width.
         (replace_window, recombine_windows): Initialize pixel values.
         (resize_root_window, resize_frame_windows, grow_mini_window)
-        (shrink_mini_window): New argument PIXELWISE.  Calculate
-        pixelwise.
+        (shrink_mini_window): New argument PIXELWISE.
+        Calculate pixelwise.
         (Fdelete_other_windows_internal, adjust_window_margins)
         (window_resize_check, window_resize_apply)
         (Fdelete_window_internal, Fresize_mini_window_internal)
@@ -368,11 +429,11 @@
         slots in save_window_data and saved_window.
         (Fset_window_scroll_bars): Fix doc-string.
         (window_resize_pixelwise): New variable.
-        (coordinates_in_window, Fcoordinates_in_window_p): Handle
-        dividers.
+        (coordinates_in_window, Fcoordinates_in_window_p):
+        Handle dividers.
         (make_parent_window): Adjust sequence_number.
-        (Fwindow_right_divider_width, Fwindow_bottom_divider_width): New
-        functions.
+        (Fwindow_right_divider_width, Fwindow_bottom_divider_width):
+        New functions.
         * window.h (struct window): New members new_pixel, pixel_left,
         pixel_top, pixel_width, pixel_height.  Restore sequence_number.
         (wset_new_pixel): New function.
@@ -406,10 +467,10 @@
         encountered.
         (Fwindow_text_pixel_size): New function.
         (resize_mini_window, update_tool_bar): Calculate pixelwise.
-        (tool_bar_lines_needed): Rename to tool_bar_height.  Calculate
-        pixelwise.
-        (Ftool_bar_lines_needed): Rename to Ftool_bar_height.  Calculate
-        pixelwise.
+        (tool_bar_lines_needed): Rename to tool_bar_height.
+        Calculate pixelwise.
+        (Ftool_bar_lines_needed): Rename to Ftool_bar_height.
+        Calculate pixelwise.
         (redisplay_tool_bar): Calculate pixelwise.
         (redisplay_window): Calculate pixelwise.  Handle dividers.
         (draw_glyphs, x_clear_end_of_line, note_mouse_highlight)
@@ -424,8 +485,8 @@
         (x_set_menu_bar_lines, x_set_tool_bar_lines): Calculate pixelwise.
         (x_set_scroll_bar_default_width): Default actual width to 16.
         (Fx_create_frame): Set sizes pixelwise.
-        (x_create_tip_frame): Default divider widths to zero.  Pixelize
-        call of change_frame_size.
+        (x_create_tip_frame): Default divider widths to zero.
+        Pixelize call of change_frame_size.
         (Fx_show_tip): Handle divider widths.  Initial pixel position
         and sizes.
         (frame_parm_handler x_frame_parm_handlers): Add divider widths.
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index fb1b96f738c..ff0f4bf7ae8 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -12845,8 +12845,8 @@
         longer DEFVARed: they are already declared in window.c.
 
         * screen.c (window_from_coordinates): Use Fnext_window, even if
-        MULTI_SCREEN, to obtain the next window.  This is an test.
-        Also, new paramater part returns text or modeline symbol.
+        MULTI_SCREEN, to obtain the next window.  This is a test.
+        Also, new parameter part returns text or modeline symbol.
         (Flocate_window_from_coordinates): Pass &part to
         window_from_coordinates.
         (coordinates_in_window): Don't say modeline if window_height is 1,
diff --git a/src/Makefile.in b/src/Makefile.in
index 7d91928acfe..cef1ba5ed2e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -139,6 +139,7 @@ M17N_FLT_LIBS = @M17N_FLT_LIBS@
 
 LIB_ACL=@LIB_ACL@
 LIB_CLOCK_GETTIME=@LIB_CLOCK_GETTIME@
+LIB_CRYPTO=@LIB_CRYPTO@
 LIB_EACCESS=@LIB_EACCESS@
 LIB_FDATASYNC=@LIB_FDATASYNC@
 LIB_TIMER_TIME=@LIB_TIMER_TIME@
@@ -403,6 +404,7 @@ ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj)
 LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
    $(LIBX_OTHER) $(LIBSOUND) \
    $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \
+   $(LIB_CRYPTO) \
    $(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
    $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) \
    $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
diff --git a/src/alloc.c b/src/alloc.c
index f076075a94f..aeda42637cd 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6633,7 +6633,12 @@ We divide the value by 1024 to make sure it fits in a Lisp integer.  */)
 {
   Lisp_Object end;
 
+#ifdef HAVE_NS
+  /* Avoid warning.  sbrk has no relation to memory allocated anyway.  */
+  XSETINT (end, 0);
+#else
   XSETINT (end, (intptr_t) (char *) sbrk (0) / 1024);
+#endif
 
   return end;
 }
diff --git a/src/emacs.c b/src/emacs.c
index af69e2c4efe..9c5a33d5a89 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1217,6 +1217,11 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
 
 #ifdef HAVE_NS
   ns_pool = ns_alloc_autorelease_pool ();
+#ifdef NS_IMPL_GNUSTEP
+  /* GNUStep stupidly resets our locale settings after we made them.  */
+  fixup_locale ();
+#endif
+
   if (!noninteractive)
     {
 #ifdef NS_IMPL_COCOA
diff --git a/src/eval.c b/src/eval.c
index 81666830f4e..1dca9295cfb 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -3597,7 +3597,7 @@ NFRAMES and BASE specify the activation frame to use, as in `backtrace-frame'.
   /* The specpdl entries normally contain the symbol being bound along with its
      `old_value', so it can be restored.  The new value to which it is bound is
      available in one of two places: either in the current value of the
-     variable (if it hasn't been rebount yet) or in the `old_value' slot of the
+     variable (if it hasn't been rebound yet) or in the `old_value' slot of the
      next specpdl entry for it.
      `backtrace_eval_unrewind' happens to swap the role of `old_value'
      and "new value", so we abuse it here, to fetch the new value.
diff --git a/src/frame.c b/src/frame.c
index 03bdf696c47..e13c3768e12 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3314,9 +3314,13 @@ x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 #endif
   /* Recalculate toolbar height.  */
   f->n_tool_bar_rows = 0;
+
   /* Ensure we redraw it.  */
   clear_current_matrices (f);
 
+  /* Attempt to hunt down bug#16028.  */
+  SET_FRAME_GARBAGED (f);
+
   recompute_basic_faces (f);
 
   do_pending_window_change (0);
diff --git a/src/frame.h b/src/frame.h
index 8369cf6b17e..0f6a674dc06 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -25,6 +25,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "dispextern.h"
 #include "termhooks.h"
+#include "window.h"
 
 INLINE_HEADER_BEGIN
 
@@ -956,10 +957,14 @@ default_pixels_per_inch_y (void)
    if some changes were applied to it while it wasn't visible (and hence
    wasn't redisplayed).  */
 
-#define SET_FRAME_VISIBLE(f, v)                                 \
-  (((f)->visible == 0 || ((f)->visible == 2)) && ((v) == 1)     \
-   ? redisplay_other_windows () : 0,                            \
-   (f)->visible = (eassert (0 <= (v) && (v) <= 2), (v)))
+INLINE void
+SET_FRAME_VISIBLE (struct frame *f, int v)
+{
+  eassert (0 <= v && v <= 2);
+  if (v == 1 && f->visible != 1)
+    redisplay_other_windows ();
+  f->visible = v;
+}
 
 /* Set iconify of frame F.  */
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index ef422989c61..e5d6414cf75 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -78,6 +78,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define remove_submenu(w) gtk_menu_item_remove_submenu ((w))
 #endif
 
+#ifdef HAVE_FREETYPE
 #if GTK_CHECK_VERSION (3, 2, 0)
 #define USE_NEW_GTK_FONT_CHOOSER 1
 #else
@@ -89,6 +90,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define  gtk_font_chooser_set_font(x, y) \
   gtk_font_selection_dialog_set_font_name (x, y)
 #endif
+#endif /* HAVE_FREETYPE */
 
 #ifndef HAVE_GTK3
 #ifdef USE_GTK_TOOLTIP
@@ -4350,7 +4352,7 @@ tb_size_cb (GtkWidget    *widget,
      size hints if tool bar size changes.  Seen on Fedora 18 at least.  */
   struct frame *f = user_data;
   if (xg_update_tool_bar_sizes (f))
-    x_wm_set_size_hint (f, 0, 0);
+    xg_height_or_width_changed (f);
 }
 
 /* Create a tool bar for frame F.  */
diff --git a/src/keyboard.c b/src/keyboard.c
index b50c06b4154..913a277ca79 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1954,10 +1954,8 @@ int poll_suppress_count;
 
 static struct atimer *poll_timer;
 
-/* Poll for input, so that we catch a C-g if it comes in.  This
-   function is called from x_make_frame_visible, see comment
-   there.  */
-
+#ifdef HAVE_NTGUI
+/* Poll for input, so that we catch a C-g if it comes in.  */
 void
 poll_for_input_1 (void)
 {
@@ -1965,6 +1963,7 @@ poll_for_input_1 (void)
       && !waiting_for_input)
     gobble_input ();
 }
+#endif
 
 /* Timer callback function for poll_timer.  TIMER is equal to
    poll_timer.  */
@@ -2016,6 +2015,8 @@ start_polling (void)
 #endif
 }
 
+#ifdef HAVE_NTGUI
+
 /* True if we are using polling to handle input asynchronously.  */
 
 bool
@@ -2030,6 +2031,7 @@ input_polling_used (void)
   return 0;
 #endif
 }
+#endif
 
 /* Turn off polling.  */
 
diff --git a/src/nsterm.h b/src/nsterm.h
index 976347ad3b4..0215f13dffd 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -90,6 +90,7 @@ typedef float EmacsCGFloat;
   BOOL isFirst;
 #endif
 #ifdef NS_IMPL_GNUSTEP
+  BOOL applicationDidFinishLaunchingCalled;
 @public
   int nextappdefined;
 #endif
diff --git a/src/nsterm.m b/src/nsterm.m
index 37edfb238a9..9c87923f32e 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1320,8 +1320,6 @@ x_set_window_size (struct frame *f,
   [view setRows: rows andColumns: cols];
   [window setFrame: wr display: YES];
 
-  fprintf (stderr, "\tx_set_window_size %d, %d\t%d, %d\n", cols, rows, pixelwidth, pixelheight);
-
   /* This is a trick to compensate for Emacs' managing the scrollbar area
      as a fixed number of standard character columns.  Instead of leaving
      blank space for the extra, we chopped it off above.  Now for
@@ -4410,15 +4408,22 @@ ns_term_shutdown (int sig)
 
 @implementation EmacsApp
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
 - (id)init
 {
   if (self = [super init])
-    self->isFirst = YES;
+    {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
+      self->isFirst = YES;
+#endif
+#ifdef NS_IMPL_GNUSTEP
+      self->applicationDidFinishLaunchingCalled = NO;
+#endif
+    }
 
   return self;
 }
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
 - (void)run
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -4605,6 +4610,9 @@ ns_term_shutdown (int sig)
    -------------------------------------------------------------------------- */
 {
   NSTRACE (applicationDidFinishLaunching);
+#ifdef NS_IMPL_GNUSTEP
+  ((EmacsApp *)self)->applicationDidFinishLaunchingCalled = YES;
+#endif
   [NSApp setServicesProvider: NSApp];
   ns_send_appdefined (-2);
 }
@@ -4732,6 +4740,10 @@ not_in_argv (NSString *arg)
 {
   NSTRACE (applicationDidBecomeActive);
 
+#ifdef NS_IMPL_GNUSTEP
+  if (! applicationDidFinishLaunchingCalled)
+    [self applicationDidFinishLaunching:notification];
+#endif
   //ns_app_active=YES;
 
   ns_update_auto_hide_menu_bar ();
@@ -5670,6 +5682,11 @@ not_in_argv (NSString *arg)
 
   if (! [self isFullscreen])
     {
+#ifdef NS_IMPL_GNUSTEP
+      // GNUStep does not always update the tool bar height.  Force it.
+      if (toolbar) update_frame_tool_bar (emacsframe);
+#endif
+
       extra = FRAME_NS_TITLEBAR_HEIGHT (emacsframe)
         + FRAME_TOOLBAR_HEIGHT (emacsframe);
     }
diff --git a/src/w32term.c b/src/w32term.c
index 9c74304a83a..64febea6a1a 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4764,9 +4764,9 @@ w32_read_socket (struct terminal *terminal,
                       record_asynch_buffer_change ();
                   }
 
-                  if (get_frame_param (f, Qfullscreen) == Qnil)
+                  if (EQ (get_frame_param (f, Qfullscreen), Qnil))
                     set_frame_param (f, Qfullscreen, Qmaximized);
-                  else if (get_frame_param (f, Qfullscreen) != Qmaximized)
+                  else if (! EQ (get_frame_param (f, Qfullscreen), Qmaximized))
                     set_frame_param (f, Qmaximized, Qmaximized);
 
                   break;
@@ -4803,9 +4803,9 @@ w32_read_socket (struct terminal *terminal,
                       record_asynch_buffer_change ();
                   }
 
-                  if (get_frame_param (f, Qfullscreen) == Qmaximized)
+                  if (EQ (get_frame_param (f, Qfullscreen), Qmaximized))
                     set_frame_param (f, Qfullscreen, Qnil);
-                  else if (get_frame_param (f, Qmaximized) != Qnil)
+                  else if (! EQ (get_frame_param (f, Qmaximized), Qnil))
                     set_frame_param (f, Qmaximized, Qnil);
 
                   break;
diff --git a/src/window.c b/src/window.c
index d1f3dd599b1..426edc6099c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3365,6 +3365,7 @@ set_window_buffer (Lisp_Object window, Lisp_Object buffer,
   /* Maybe we could move this into the `if' but it's not obviously safe and
      I doubt it's worth the trouble.  */
   wset_redisplay (w);
+  w->update_mode_line = true;
 
   /* We must select BUFFER for running the window-scroll-functions.  */
   /* We can't check ! NILP (Vwindow_scroll_functions) here
diff --git a/src/xmenu.c b/src/xmenu.c
index d587610fdd7..fb3baa01ef4 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -510,9 +510,7 @@ static void
 popup_activate_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
 {
   popup_activated_flag = 1;
-#ifdef USE_X_TOOLKIT
   x_activate_timeout_atimer ();
-#endif
 }
 #endif
 
diff --git a/src/xterm.c b/src/xterm.c
index e8e69c666ee..90c7c36c44f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -248,6 +248,9 @@ static void x_sync_with_move (struct frame *, int, int, int);
 static int handle_one_xevent (struct x_display_info *,
                               const XEvent *, int *,
                               struct input_event *);
+#if ! (defined USE_X_TOOLKIT || defined USE_MOTIF)
+static int x_dispatch_event (XEvent *, Display *);
+#endif
 /* Don't declare this _Noreturn because we want no
    interference with debugging failing X calls.  */
 static void x_connection_closed (Display *, const char *);
diff --git a/src/xterm.h b/src/xterm.h
index 3d954fb8600..eff75403476 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -945,7 +945,9 @@ extern void x_clear_area (Display *, Window, int, int, int, int);
 extern void x_mouse_leave (struct x_display_info *);
 #endif
 
+#if defined USE_X_TOOLKIT || defined USE_MOTIF
 extern int x_dispatch_event (XEvent *, Display *);
+#endif
 extern int x_x_to_emacs_modifiers (struct x_display_info *, int);
 extern int x_display_pixel_height (struct x_display_info *);
 extern int x_display_pixel_width (struct x_display_info *);