auto upstream

1 files changed, 34 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1083dc5513d..81b4978dba5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,37 @@
+2012-12-29  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-sh-handle-file-acl): Suppress basic attributes.
+        (tramp-sh-handle-set-file-acl): Return `t' on success.
+
+2012-12-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * files.el (backup-buffer-copy, basic-save-buffer-2): If
+        set-file-extended-attributes fails, fall back on set-file-modes
+        instead of signaling an error.  (Bug#13298)
+        (basic-save-buffer): Likewise.
+
+2012-12-29  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-29  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-29  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el: Remove cl dependency.
+        (python-syntax-count-quotes): Replace incf call.
+        (python-fill-string): Replace setf call.
+
+2012-12-29  Damien Cassou  <damien.cassou@gmail.com>
+
+        * info.el (info-other-window): New arg, for consistency with info.
+
 2012-12-28  Martin Rudalics  <rudalics@gmx.at>
 
         * mail/rmail.el (rmail-maybe-display-summary): Rewrite