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

[Lars Hansen]

Index: emacs/lisp/net/tramp.el
diff -c emacs/lisp/net/tramp.el:1.79 emacs/lisp/net/tramp.el:1.80
*** emacs/lisp/net/tramp.el:1.79        Sat Oct  8 14:53:16 2005
--- emacs/lisp/net/tramp.el     Sat Oct  8 18:25:56 2005
***************
*** 1617,1624 ****
  on the remote file system.")
  
  (defconst tramp-perl-directory-files-and-attributes "\
! chdir($ARGV[0]);
! opendir(DIR,\".\");
  @list = readdir(DIR);
  closedir(DIR);
  $n = scalar(@list);
--- 1617,1624 ----
  on the remote file system.")
  
  (defconst tramp-perl-directory-files-and-attributes "\
! chdir($ARGV[0]) or printf(\"\\\"Cannot change to $ARGV[0]: $''!''\\\"\\n\"), 
exit();
! opendir(DIR,\".\") or printf(\"\\\"Cannot open directory $ARGV[0]: 
$''!''\\\"\\n\"), exit();
  @list = readdir(DIR);
  closedir(DIR);
  $n = scalar(@list);
***************
*** 2731,2737 ****
                                      (tramp-shell-quote-argument localname)
                                      (or id-format 'integer)))
          (tramp-wait-for-output)
!         (let* ((root (cons nil (read (current-buffer))))
                 (cell root))
            (while (cdr cell)
              (if (and match (not (string-match match (caadr cell))))
--- 2731,2740 ----
                                      (tramp-shell-quote-argument localname)
                                      (or id-format 'integer)))
          (tramp-wait-for-output)
!         (let* ((root (cons nil (let ((object (read (current-buffer))))
!                                  (when (stringp object)
!                                    (error object))
!                                  object)))
                 (cell root))
            (while (cdr cell)
              (if (and match (not (string-match match (caadr cell))))