5 files changed, 29 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5cadef9490b..f83f6bafd03 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2007-05-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c [USE_CARBON_EVENTS] (mac_handle_window_event):
+        Call mac_wakeup_from_rne on window size change.
+
+2007-05-23  Johannes Weiner <hannes@saeurebad.de> (tiny change)
+
+        * keyboard.c (make_lispy_movement): Condition on HAVE_GPM too.
+
+2007-05-22  Richard Stallman  <rms@gnu.org>
+
+        * xterm.c (x_connection_closed): Remove NO_RETURN.
+
+2007-05-22  Martin Rudalics  <rudalics@gmx.at>
+
+        * syntax.c (scan_words): Fix arg to UPDATE_SYNTAX_TABLE_BACKWARD.
+
 2007-05-21  Chong Yidong  <cyd@stupidchicken.com>
 
         * image.c (uncache_image): New function.
diff --git a/src/keyboard.c b/src/keyboard.c
index 4658fdcca51..576afd29843 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6189,7 +6189,7 @@ make_lispy_event (event)
     }
 }
 
-#ifdef HAVE_MOUSE
+#if defined(HAVE_MOUSE) || defined(HAVE_GPM)
 
 static Lisp_Object
 make_lispy_movement (frame, bar_window, part, x, y, time)
@@ -6228,7 +6228,7 @@ make_lispy_movement (frame, bar_window, part, x, y, time)
     }
 }
 
-#endif /* HAVE_MOUSE */
+#endif /* HAVE_MOUSE || HAVE GPM */
 
 /* Construct a switch frame event.  */
 static Lisp_Object
diff --git a/src/macterm.c b/src/macterm.c
index e31fba134f5..871bf9cd6f9 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -9888,6 +9888,7 @@ mac_handle_window_event (next_handler, event, data)
               width = bounds.right - bounds.left;
               height = bounds.bottom - bounds.top;
               mac_handle_size_change (f, width, height);
+              mac_wakeup_from_rne ();
             }
         }
 
diff --git a/src/syntax.c b/src/syntax.c
index acb5d37825c..9161512a15b 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1276,19 +1276,19 @@ scan_words (from, count)
          position of it.  */
       while (1)
         {
-          int temp_byte;
-
           if (from == beg)
             break;
-          temp_byte = dec_bytepos (from_byte);
+          DEC_BOTH (from, from_byte);
           UPDATE_SYNTAX_TABLE_BACKWARD (from);
-          ch0 = FETCH_CHAR (temp_byte);
+          ch0 = FETCH_CHAR (from_byte);
           code = SYNTAX (ch0);
           if (!(words_include_escapes
                 && (code == Sescape || code == Scharquote)))
             if (code != Sword || WORD_BOUNDARY_P (ch0, ch1))
-              break;
-          DEC_BOTH (from, from_byte);
+              {
+                INC_BOTH (from, from_byte);
+                break;
+              }
           ch1 = ch0;
         }
       count++;
diff --git a/src/xterm.c b/src/xterm.c
index 8b0078d6af6..6fcaa3d1294 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -371,7 +371,9 @@ static void x_check_expected_move P_ ((struct frame *, int, int));
 static void x_sync_with_move P_ ((struct frame *, int, int, int));
 static int handle_one_xevent P_ ((struct x_display_info *, XEvent *,
                                   int *, struct input_event *));
-static SIGTYPE x_connection_closed P_ ((Display *, char *)) NO_RETURN;
+/* Don't declare this NO_RETURN because we want no
+   interference with debugging failing X calls.  */
+static SIGTYPE x_connection_closed P_ ((Display *, char *));
 
 
 /* Flush display of frame F, or of all frames if F is null.  */