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

[Kim F . Storm]

Index: emacs/lisp/net/tramp-smb.el
diff -c emacs/lisp/net/tramp-smb.el:1.14 emacs/lisp/net/tramp-smb.el:1.15
*** emacs/lisp/net/tramp-smb.el:1.14    Sun Jan 16 13:18:31 2005
--- emacs/lisp/net/tramp-smb.el Wed Feb  9 15:50:37 2005
***************
*** 340,350 ****
    (mapcar
     (lambda (x)
       ;; We cannot call `file-attributes' for backward compatibility reasons.
!      ;; Its optional parameter ID-FORMAT is introduced with Emacs 21.4.
       (cons x (tramp-smb-handle-file-attributes
        (if full x (concat (file-name-as-directory directory) x)) id-format)))
     (directory-files directory full match nosort)))
!  
  (defun tramp-smb-handle-file-attributes (filename &optional id-format)
    "Like `file-attributes' for tramp files."
  ;  (with-parsed-tramp-file-name filename nil
--- 340,350 ----
    (mapcar
     (lambda (x)
       ;; We cannot call `file-attributes' for backward compatibility reasons.
!      ;; Its optional parameter ID-FORMAT is introduced with Emacs 22.1.
       (cons x (tramp-smb-handle-file-attributes
        (if full x (concat (file-name-as-directory directory) x)) id-format)))
     (directory-files directory full match nosort)))
! 
  (defun tramp-smb-handle-file-attributes (filename &optional id-format)
    "Like `file-attributes' for tramp files."
  ;  (with-parsed-tramp-file-name filename nil
***************
*** 500,506 ****
             (entries (tramp-smb-get-file-entries user host share file)))
  
        ;; Delete dummy "" entry, useless entries
!       (setq entries 
              (if (file-directory-p filename)
                  (delq (assoc "" entries) entries)
                ;; We just need the only and only entry FILENAME.
--- 500,506 ----
             (entries (tramp-smb-get-file-entries user host share file)))
  
        ;; Delete dummy "" entry, useless entries
!       (setq entries
              (if (file-directory-p filename)
                  (delq (assoc "" entries) entries)
                ;; We just need the only and only entry FILENAME.