Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 20-21)

   - Update from CVS

2007-05-18  Richard M. Stallman  <rms@gnu.org>

   * lisp/simple.el (push-mark): Doc fix.

2007-05-18  Rob Riepel  <riepel@Stanford.EDU>

   * lisp/emulation/tpu-edt.el (CSI-map, SS3-map) Moved from global-map to
   tpu-global-map.
   (tpu-original-global-map) Variable deleted.
   (tpu-control-keys-map) New keymap variable.
   (tpu-set-control-keys) Use tpu-reset-control-keys rather than
   setting keymapping directly.
   (tpu-reset-control-keys) Use tpu-control-keys-map instead of
   tpu-global-map.
   (tpu-edt-on): Activate the tpu-global-map.
   (tpu-edt-off): Deactivate the tpu-global-map.

2007-05-18  Ryan Yeske  <rcyeske@gmail.com>

   * lisp/textmodes/ispell.el (ispell-get-word): Return markers
   for start and end positions.
   (ispell-word): Assume END is a marker.

2007-05-19  Stefan Monnier  <monnier@iro.umontreal.ca>

   * src/syntax.c (skip_chars): Update syntax-table only after we checked that
   the new location is valid.

2007-05-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>

   * src/macterm.c (x_calc_absolute_position): Add BLOCK_INPUT around
   mac_get_window_bounds.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-759

3 files changed, 13 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e21a1ca1389..c2394e368b0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2007-05-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * syntax.c (skip_chars): Update syntax-table only after we checked that
+        the new location is valid.
+
+2007-05-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (x_calc_absolute_position): Add BLOCK_INPUT around
+        mac_get_window_bounds.
+
 2007-05-20  Nick Roberts  <nickrob@snap.net.nz>
 
         * Makefile.in (LIBGPM): Allow it to be set from configure.
diff --git a/src/macterm.c b/src/macterm.c
index 1acb521f47b..9c1a151f4a9 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -6084,7 +6084,9 @@ x_calc_absolute_position (f)
 
   /* Find the offsets of the outside upper-left corner of
      the inner window, with respect to the outer window.  */
+  BLOCK_INPUT;
   mac_get_window_bounds (f, &inner, &outer);
+  UNBLOCK_INPUT;
 
   width_diff = (outer.right - outer.left) - (inner.right - inner.left);
   height_diff = (outer.bottom - outer.top) - (inner.bottom - inner.top);
diff --git a/src/syntax.c b/src/syntax.c
index a9e6dda81fe..acb5d37825c 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1669,10 +1669,10 @@ skip_chars (forwardp, syntaxp, string, lim, handle_iso_classes)
                       p = GPT_ADDR;
                       stop = endp;
                     }
+                  UPDATE_SYNTAX_TABLE_BACKWARD (pos - 1);
                   if (! fastmap[(int) SYNTAX (p[-1])])
                     break;
                   p--, pos--;
-                  UPDATE_SYNTAX_TABLE_BACKWARD (pos - 1);
                 }
           }
       }