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

diff --cc lisp/ChangeLog
Simple merge

diff --cc src/ChangeLog
index 4f44f7d0834bd783dc8cde889a8ae020c46b28d7,12d92626b3fa792166eb74ee9d4c1ce3e060332f..59a0af5e2c85c51552297cf7b8d59632bbdf90a0
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,11 -1,17 +1,15 @@@
 -2007-05-06  Richard Stallman  <rms@gnu.org>
+ 2007-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * editfns.c (Ftranspose_regions): Yet another int/Lisp_Object mixup (YAILOM)
+ 
 +2007-05-07  Andreas Schwab  <schwab@suse.de>
  
 -      * process.c: Undo May 3 change.
 +      * keymap.c (Flookup_key): Fix typo in last change. 
  
 -2007-05-03  Per Cederqvist  <ceder@lysator.liu.se>  (tiny change)
 +2007-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
  
 -      * process.c (Faccept_process_output): Revert 2006-03-22 change so
 -      that the third argument once again is in microseconds (not
 -      milliseconds).  This makes it compatible with Emacs 21 and
 -      earlier.  Problem found by Henrik Rindl\e,Av\e(Bw.
 +      * keymap.c (Fdefine_key, Flookup_key): Only do the 0x80->meta_modifier
 +      mapping for unibyte strings.
  
  2007-05-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>