auto upstream

1 files changed, 46 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index abcf6578060..68cff2f6d29 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,49 @@
+2013-02-21  Bastien Guerry  <bzg@gnu.org>
+
+        * cmuscheme.el (scheme-buffer): Fix docstring.  (Bug#13778)
+
+2013-02-21  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el (python-info-current-defun): Enhance
+        match-data cluttering prevention.
+
+2013-02-21  Glenn Morris  <rgm@gnu.org>
+
+        * net/tramp.el (tramp-get-debug-buffer): Ensure outline.el is not
+        loaded while outline-regexp is let bound.  (Bug#9584)
+
+2013-02-21  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el (python-info-current-defun): Fix failed
+        defun name retrieval because of unwanted match-data cluttering.
+
+2013-02-21  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-ssh-controlmaster-template): Make it a
+        defconst.  Apply independent check for ControlPersist.
+
+        * net/tramp-sh.el (tramp-sh-handle-set-file-times): Set $UTC only
+        temporarily, via "env".
+
+2013-02-21  Glenn Morris  <rgm@gnu.org>
+
+        * info.el (Info-enable-edit): Remove.
+        (Info-edit): Disable it rather than using Info-enable.
+        (Info-edit-mode-hook, Info-edit-map, Info-edit-mode, Info-edit)
+        (Info-cease-edit): Make editing of Info files obsolete.
+
+        * informat.el (Info-tagify):
+        Handle buffers not visiting files.  (Bug#13763)
+
+2013-02-21  Juanma Barranquero  <lekktu@gmail.com>
+
+        * calc/calc-graph.el (calc-graph-show-dumb): Fix typo.
+
+2013-02-21  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (basic-save-buffer): Move check for existing parent
+        directory after hooks.  (Bug#13773)
+
 2013-02-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * simple.el (command-execute): Move from C.  Add obsolete check.