Merge from trunk.

1 files changed, 32 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 737a91e2e4a..d1b827966de 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,25 @@
+2013-03-30  Fabián Ezequiel Gallina  <fabian@anue.biz>
+
+        Un-indent after "pass" and "return" statements (Bug#13888)
+        * progmodes/python.el (python-indent-block-enders): New var.
+        (python-indent-calculate-indentation): Use it.
+
+2013-03-30  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-drop-volume-letter): Make it an ordinary
+        defun.  Defining it as defalias could introduce too eager
+        byte-compiler optimization.  (Bug#14030)
+
+2013-03-30  Chong Yidong  <cyd@gnu.org>
+
+        * iswitchb.el (iswitchb-read-buffer): Fix typo.
+
+2013-03-30  Leo Liu  <sdl.web@gmail.com>
+
+        * kmacro.el (kmacro-call-macro): Add optional arg MACRO.
+        (kmacro-execute-from-register): Pass the keyboard macro to
+        kmacro-call-macro or repeating won't work correctly.
+
 2013-03-30  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * progmodes/subword.el: Back to using `forward-symbol'.
@@ -56,6 +78,11 @@
         over symbol_words (parallels and leverages `subword-mode' which
         does word motion inside MixedCaseWords).
 
+2013-03-27  Aidan Gauland  <aidalgol@no8wireless.co.nz>
+
+        * eshell/em-unix.el: Moved su and sudo to...
+        * eshell/em-tramp.el: ...Eshell tramp module
+
 2013-03-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * desktop.el (desktop--v2s): Rename from desktop-internal-v2s.
@@ -1054,6 +1081,11 @@
         (eieio-browse-tree, eieio-browse): Use eieio--check-type.
 
 
+2013-02-18  Aidan Gauland  <aidalgol@no8wireless.co.nz>
+
+        * eshell/em-cmpl.el: Corrected "context-related help"
+        keybinding in commentary.
+
 2013-02-18  Michael Heerdegen  <michael_heerdegen@web.de>
 
         * emacs-lisp/eldoc.el (eldoc-highlight-function-argument):