[Emacs-commit] emacs src/editfns.c src/ChangeLog lisp/progmode...

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/05/08 02:07:17

Modified files:
        src            : editfns.c ChangeLog 
        lisp/progmodes : python.el 
        lisp           : ChangeLog 
        etc            : NEWS 

Log message:
        Merge from emacs--rel--22
        
        Patches applied:
        
         * emacs--rel--22  (patch 11)
        
           - Update from CVS
        
        2007-05-08  David Reitter  <address@hidden>
        
           * lisp/progmodes/python.el (python-guess-indent): Check non-nullness
           before comparing indent against the 2..8 interval.
        
        2007-05-07  Stefan Monnier  <address@hidden>
        
           * src/editfns.c (Ftranspose_regions): Yet another int/Lisp_Object 
mixup
             (YAILOM)
        
        Revision: address@hidden/emacs--devo--0--patch-736

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/editfns.c?cvsroot=emacs&r1=1.439&r2=1.440
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.5660&r2=1.5661
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/python.el?cvsroot=emacs&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.11073&r2=1.11074
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/NEWS?cvsroot=emacs&r1=1.1473&r2=1.1474