1 files changed, 13 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7bd027a81d4..bd1cbbcf5bb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2013-03-18  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-compat.el (tramp-compat-user-error): New defun.
+
+        * net/tramp-adb.el (tramp-adb-handle-shell-command):
+        * net/tramp-gvfs.el (top):
+        * net/tramp.el (tramp-find-method, tramp-dissect-file-name)
+        (tramp-handle-shell-command): Use it.
+        (tramp-dissect-file-name): Raise an error when hostname is a
+        method name, and neither method nor user is specified.
+
+        * net/trampver.el: Update release number.
+
 2013-03-18  Leo Liu  <sdl.web@gmail.com>
 
         Make sure eldoc can be turned off properly.