Merge from emacs-24; up to 2014-04-22T20:19:17Z!eggert@cs.ucla.edu

1 files changed, 37 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d73c602def..623d81f4715 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,40 @@
+2014-04-22  Michael Heerdegen  <michael_heerdegen@web.de>
+
+        * dired.el (dired-insert-set-properties): Do not consider
+        subdirectory headings and empty lines to be information that
+        `dired-hide-details-mode' should hide.  (Bug#17228)
+
+2014-04-22  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-sh-handle-file-name-all-completions):
+        Remove test messages.
+        (tramp-do-copy-or-rename-file-out-of-band): Do not quote `source'
+        and `target' twice.
+
+2014-04-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * dframe.el (dframe-get-focus): Remove `hook' argument (bug#17311).
+        * speedbar.el (speedbar-get-focus): Run the "hook" afterwards instead.
+
+        * emacs-lisp/cl-macs.el (cl--loop-let): Avoid `nil' as var name.
+
+2014-04-22  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-sh-handle-file-name-all-completions):
+        Set "IFS=" when using read builtin, in order to preserve spaces in
+        the file name.  Add test messages for hunting a bug on hydra.
+        (tramp-get-ls-command): Undo using "-b" argument.  It doesn't help.
+
+2014-04-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/prog-mode.el (prettify-symbols--compose-symbol):
+        Don't prettify a word within a symbol.
+
+2014-04-22  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-get-ls-command): Use "-b" argument if
+        possible.
+
 2014-04-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/lisp-mode.el (lisp--match-hidden-arg): New function.