3 files changed, 22 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4469297e32f..c677288ad3e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2011-02-12  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (select_window): Check inhibit_point_swap argument when
+        deciding whether to return immediately.
+
+2011-02-12  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become
+        zero (Bug#7348).
+
+2011-02-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * config.in (TERMINFO): New definition.
+
+        * s/netbsd.h: Use it to choose between terminfo and termcap
+        (Bug#7642).
+
 2011-02-12  Paul Eggert  <eggert@cs.ucla.edu>
 
         * md5.c (md5_process_bytes): Use sizeof, not __alignof__.
@@ -1610,7 +1627,7 @@
 
         * gtkutil.c (menubar_map_cb): New function (Bug#7425).
         (xg_update_frame_menubar): Connect signal map to menubar_map_cb.
-        Use 23 as menubar height if 0. (Bug#7425).
+        Use 23 as menubar height if 0.  (Bug#7425).
 
 2010-11-26  Eli Zaretskii  <eliz@gnu.org>
 
@@ -2617,7 +2634,7 @@
         is more portable.
 
         * keyboard.c (gobble_input): Move call of xd_read_queued_messages ...
-        (kbd_buffer_get_event): ... here. This is needed for cygwin, which
+        (kbd_buffer_get_event): ... here.  This is needed for cygwin, which
         has not defined SIGIO.
 
 2010-10-08  Chong Yidong  <cyd@stupidchicken.com>
diff --git a/src/nsterm.m b/src/nsterm.m
index e83b14748df..590a76ba16d 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5783,6 +5783,7 @@ ns_term_shutdown (int sig)
   win = nwin;
   condemned = NO;
   pixel_height = NSHeight (r);
+  if (pixel_height == 0) pixel_height = 1;
   min_portion = 20 / pixel_height;
 
   frame = XFRAME (XWINDOW (win)->frame);
@@ -5812,6 +5813,7 @@ ns_term_shutdown (int sig)
   NSTRACE (EmacsScroller_setFrame);
 /*  BLOCK_INPUT; */
   pixel_height = NSHeight (newRect);
+  if (pixel_height == 0) pixel_height = 1;
   min_portion = 20 / pixel_height;
   [super setFrame: newRect];
   [self display];
diff --git a/src/window.c b/src/window.c
index abf01758c3f..b158073a3db 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3517,7 +3517,7 @@ select_window (Lisp_Object window, Lisp_Object norecord, int inhibit_point_swap)
       record_buffer (w->buffer);
     }
 
-  if (EQ (window, selected_window))
+  if (EQ (window, selected_window) && !inhibit_point_swap)
     return window;
 
   sf = SELECTED_FRAME ();