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

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       07/09/30 16:43:07

Index: net/tramp-smb.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp-smb.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- net/tramp-smb.el    21 Sep 2007 05:24:05 -0000      1.31
+++ net/tramp-smb.el    30 Sep 2007 16:43:07 -0000      1.32
@@ -30,15 +30,12 @@
 
 (require 'tramp)
 (require 'tramp-cache)
+(require 'tramp-compat)
 
 ;; Pacify byte-compiler
-(eval-when-compile (require 'custom))
-
-;; Avoid byte-compiler warnings if the byte-compiler supports this.
-;; Currently, XEmacs supports this.
 (eval-when-compile
-  (when (featurep 'xemacs)
-      (byte-compiler-options (warnings (- unused-vars)))))
+  (require 'cl)
+  (require 'custom))
 
 ;; Define SMB method ...
 (defcustom tramp-smb-method "smb"
@@ -763,7 +760,7 @@
 Result is the list (LOCALNAME MODE SIZE MTIME)."
 ;; We are called from `tramp-smb-get-file-entries', which sets the
 ;; current buffer.
-  (let ((line (buffer-substring (point) (tramp-line-end-position)))
+  (let ((line (buffer-substring (point) (tramp-compat-line-end-position)))
        localname mode size month day hour min sec year mtime)
 
     (if (not share)
@@ -891,7 +888,7 @@
        (when (and p (processp p)) (delete-process p))
 
        (unless (let ((default-directory
-                       (tramp-temporary-file-directory)))
+                       (tramp-compat-temporary-file-directory)))
                  (executable-find tramp-smb-program))
          (error "Cannot find command %s in %s" tramp-smb-program exec-path))
 
@@ -930,7 +927,8 @@
 
          (let* ((coding-system-for-read nil)
                 (process-connection-type tramp-process-connection-type)
-                (p (let ((default-directory (tramp-temporary-file-directory)))
+                (p (let ((default-directory
+                           (tramp-compat-temporary-file-directory)))
                      (apply #'start-process
                             (tramp-buffer-name vec) (tramp-get-buffer vec)
                             tramp-smb-program args))))