Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 11) - Update from CVS 2007-05-08 David Reitter <david.reitter@gmail.com> * lisp/progmodes/python.el (python-guess-indent): Check non-nullness before comparing indent against the 2..8 interval. 2007-05-07 Stefan Monnier <monnier@iro.umontreal.ca> * src/editfns.c (Ftranspose_regions): Yet another int/Lisp_Object mixup (YAILOM) Revision: emacs@sv.gnu.org/emacs--devo--0--patch-736