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

2 files changed, 5 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4f44f7d0834..59a0af5e2c8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+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>
 
         * keymap.c (Flookup_key): Fix typo in last change. 
diff --git a/src/editfns.c b/src/editfns.c
index 2ab852d2925..37498e3b6f7 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4393,8 +4393,7 @@ Transposing beyond buffer boundaries is an error.  */)
       fix_start_end_in_overlays (start1, end2);
     }
 
-  signal_after_change (XINT (start1), XINT (end2 - start1),
-                       XINT (end2 - start1));
+  signal_after_change (start1, end2 - start1, end2 - start1);
   return Qnil;
 }