Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 20-21) - Update from CVS 2007-05-18 Richard 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