* net/tramp-sh.el (tramp-sh-handle-file-truename): Preserve trailing "/".

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2dad756..de5dd56 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2014-02-23  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp-sh.el (tramp-sh-handle-file-truename):
+       Preserve trailing "/".  (Bug#16851)
+
+2014-02-23  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-smie-rules): Don't indent specially
+       after `=>' (bug#16811).
+       (ruby-smie-rules): Handle the inconsistent second element of the
+       list returned by `smie-indent--parent'.
+       (ruby-font-lock-keywords): Disqualify any identifier before `=' as
+       method call.
+
 2014-02-23  Juanma Barranquero  <lekktu@gmail.com>
 
        * elec-pair.el (electric-pair-text-syntax-table)
@@ -121,7 +135,7 @@
        (tramp-handle-insert-directory): New defun, taken from tramp-gvfs.el.
 
        * net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist)
-       <insert-directory>: Use `tramp-handle-insert-directory.
+       <insert-directory>: Use `tramp-handle-insert-directory'.
        (tramp-gvfs-handle-insert-directory): Remove function.
 
        * net/tramp-sh.el (tramp-sh-handle-insert-directory):