[Emacs-diffs] emacs/lisp ChangeLog net/tramp.el

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       09/12/09 10:23:04

Modified files:
        lisp           : ChangeLog 
        lisp/net       : tramp.el 

Log message:
        * net/tramp.el (tramp-handle-insert-directory): Suppress error messages.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16875&r2=1.16876
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/tramp.el?cvsroot=emacs&r1=1.274&r2=1.275

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16875
retrieving revision 1.16876
diff -u -b -r1.16875 -r1.16876
--- ChangeLog   9 Dec 2009 06:04:09 -0000       1.16875
+++ ChangeLog   9 Dec 2009 10:23:00 -0000       1.16876
@@ -1,3 +1,7 @@
+2009-12-09  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
+
 2009-12-09  Dan Nicolaescu  <address@hidden>
 
        Fix short log parsing and fontification.

Index: net/tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -b -r1.274 -r1.275
--- net/tramp.el        7 Dec 2009 06:38:09 -0000       1.274
+++ net/tramp.el        9 Dec 2009 10:23:04 -0000       1.275
@@ -4077,7 +4077,7 @@
       (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 @@
                    (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)))))
+                   (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)))))
+         (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."