Backported revisions 2012-12-29T12:33:33Z!fgallina@gnu.org and 2012-12-29T12:57:49Z!fgallina@gnu.org from trunk.

1 files changed, 12 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0bf336cfbe1..6a1ebc7e0e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2012-12-31  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el: Support other commands triggering
+        python-indent-line so indentation cycling continues to work.
+        (python-indent-trigger-commands): New defcustom.
+        (python-indent-line): Use it.
+
+2012-12-31  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el (python-shell-send-region): Add blank lines
+        for non sent code so backtraces remain correct.
+
 2012-12-31  Andreas Schwab  <schwab@linux-m68k.org>
 
         * emacs-lisp/byte-run.el (defmacro): Don't lose final nil if