2 files changed, 12 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb86c82846d..c91f8786d28 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-09  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
+
 2009-12-09  Dan Nicolaescu  <dann@ics.uci.edu>
 
         Fix short log parsing and fontification.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index d50b885955b..8bc010d29b2 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4077,7 +4077,7 @@ This is like `dired-recursive-delete-directory' for Tramp files."
       (if full-directory-p
           (tramp-send-command
            v
-           (format "%s %s %s"
+           (format "%s %s %s 2>/dev/null"
                    (tramp-get-ls-command v)
                    switches
                    (if wildcard
@@ -4126,13 +4126,13 @@ This is like `dired-recursive-delete-directory' for Tramp files."
                     (end (+ beg (read (current-buffer)))))
                 (if (memq (char-after end) '(?\n ?\ ))
                     ;; End is followed by \n or by " -> ".
-                    (put-text-property start end 'dired-filename t)))))
-          ;; Remove trailing lines.
-          (goto-char (tramp-compat-line-beginning-position))
-          (while (looking-at "//")
-            (forward-line 1)
-            (delete-region (match-beginning 0) (point)))))
-      (goto-char (point-max)))))
+                    (put-text-property start end 'dired-filename t))))))
+        ;; Remove trailing lines.
+        (goto-char (tramp-compat-line-beginning-position))
+        (while (looking-at "//")
+          (forward-line 1)
+          (delete-region (match-beginning 0) (point)))
+        (goto-char (point-max))))))
 
 (defun tramp-handle-unhandled-file-name-directory (filename)
   "Like `unhandled-file-name-directory' for Tramp files."