2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59822ba5128..b67d5f11f36 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-16  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-handle-file-name-as-directory): New defun.
+        (tramp-file-name-handler-alist): Handle `file-name-as-directory'.
+
+        * net/tramp-fish.el (tramp-fish-file-name-handler-alist)
+        * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Handle
+        `file-name-as-directory'.
+
 2008-11-16  Chong Yidong  <cyd@stupidchicken.com>
 
         * startup.el (fancy-startup-text): Give "Emacs tutorial" line the
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index a3ac67e0b7a..af6cf93dd1e 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -150,7 +150,7 @@ See `tramp-actions-before-shell' for more info.")
     (file-remote-p . tramp-handle-file-remote-p)
     (file-modes . tramp-handle-file-modes)
     (file-name-all-completions . tramp-smb-handle-file-name-all-completions)
-    ;; `file-name-as-directory' performed by default handler
+    (file-name-as-directory . tramp-handle-file-name-as-directory)
     (file-name-completion . tramp-handle-file-name-completion)
     (file-name-directory . tramp-handle-file-name-directory)
     (file-name-nondirectory . tramp-handle-file-name-nondirectory)