Merge from origin/emacs-24

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7620a0730a67a34f64ed844b110dfbfd141be564..9d5416c5cea599497bc95e45017cc368851b4fe8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2015-01-01  Eli Zaretskii  <eliz@gnu.org>
+
+       * tool-bar.el (tool-bar-local-item)
+       (tool-bar-local-item-from-menu): Call force-mode-line-update to
+       make sure the tool-bar changes show on display.
+
+2015-01-01  Michael Albinus  <michael.albinus@gmx.de>
+
+       Sync with Tramp 2.2.11.
+
+       * net/tramp-compat.el (top): Require cl-macs for Emacs 22.
+       Make an alias for `default-toplevel-value' if it doesn't exist.
+
+       * net/tramp-smb.el (tramp-smb-handle-copy-directory):
+       Use `tramp-compat-delete-directory'.
+
+       * net/trampver.el: Update release number.
+
+2015-01-01  Filipp Gunbin  <fgunbin@fastmail.fm>
+
+       * autorevert.el (auto-revert-handler): Fix auto-revert-tail-mode
+       for remote files.  (Bug#19449)
+
 2015-01-01  Simen Heggestøyl  <simenheg@gmail.com>  (tiny change)
 
        * textmodes/css-mode.el (scss-mode): Fix typo (bug#19446).