diff lisp/net/tramp-sh.el @ 110776:073caec7510f

* net/tramp.el (tramp-handle-directory-files-and-attributes) (tramp-handle-file-exists-p, tramp-handle-file-newer-than-file-p): New defuns, taken from tramp-smb.el. (tramp-coding-system-change-eol-conversion) (tramp-set-process-query-on-exit-flag): Removed. * net/tramp-compat.el (top): Do not check for byte-compiler objects. (tramp-compat-coding-system-change-eol-conversion) (tramp-compat-set-process-query-on-exit-flag): New defuns, taken from tramp.el. * net/tramp-gvfs.el: * net/tramp-gw.el: Replace `tramp-set-process-query-on-exit-flag' by `tramp-compat-set-process-query-on-exit-flag'. * net/tramp-imap.el (tramp-imap-file-name-handler-alist): Use `tramp-handle-directory-files-and-attributes', `tramp-handle-file-exists-p' and `tramp-handle-file-newer-than-file-p'. (tramp-imap-handle-file-exists-p) (tramp-imap-handle-file-executable-p) (tramp-imap-handle-file-readable-p) (tramp-imap-handle-directory-files-and-attributes) (tramp-imap-handle-file-newer-than-file-p): Removed. * net/tramp-sh.el: Replace `tramp-set-process-query-on-exit-flag' by `tramp-compat-set-process-query-on-exit-flag' and `tramp-coding-system-change-eol-conversion' by `tramp-compat-coding-system-change-eol-conversion'. * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Use `tramp-handle-directory-files-and-attributes', `tramp-handle-file-exists-p' and `tramp-handle-file-newer-than-file-p'. (tramp-smb-handle-directory-files-and-attributes) (tramp-smb-handle-file-exists-p) (tramp-smb-handle-file-newer-than-file-p): Removed. (tramp-smb-maybe-open-connection): Replace `tramp-set-process-query-on-exit-flag' by `tramp-compat-set-process-query-on-exit-flag'.

--- a/lisp/net/tramp-sh.el	Tue Oct 05 13:19:07 2010 +0000
+++ b/lisp/net/tramp-sh.el	Tue Oct 05 16:20:24 2010 +0200
@@ -2310,7 +2310,7 @@
 				  (append copy-args (list source target))))))
 		  (tramp-message
 		   v 6 "%s" (mapconcat 'identity (process-command p) " "))
-		  (tramp-set-process-query-on-exit-flag p nil)
+		  (tramp-compat-set-process-query-on-exit-flag p nil)
 		  (tramp-process-actions p v tramp-actions-copy-out-of-band))))
 
 	  ;; Reset the transfer process properties.
@@ -2677,7 +2677,7 @@
 	    ;; Set sentinel and query flag for this process.
 	    (tramp-set-connection-property p "vector" v)
 	    (set-process-sentinel p 'tramp-process-sentinel)
-	    (tramp-set-process-query-on-exit-flag p t)
+	    (tramp-compat-set-process-query-on-exit-flag p t)
 	    ;; Return process.
 	    p))
       ;; Save exit.
@@ -3694,10 +3694,10 @@
 	  (setq cs-encode (cdr cs))
 	  (unless cs-decode (setq cs-decode 'undecided))
 	  (unless cs-encode (setq cs-encode 'undecided))
-	  (setq cs-encode (tramp-coding-system-change-eol-conversion
+	  (setq cs-encode (tramp-compat-coding-system-change-eol-conversion
 			   cs-encode 'unix))
 	  (when (search-forward "\r" nil t)
-	    (setq cs-decode (tramp-coding-system-change-eol-conversion
+	    (setq cs-decode (tramp-compat-coding-system-change-eol-conversion
 			     cs-decode 'dos)))
 	  (tramp-compat-funcall
 	   'set-buffer-process-coding-system cs-decode cs-encode)
@@ -4244,7 +4244,7 @@
 	     vec 6 "%s" (mapconcat 'identity (process-command p) " "))
 
 	    ;; Check whether process is alive.
-	    (tramp-set-process-query-on-exit-flag p nil)
+	    (tramp-compat-set-process-query-on-exit-flag p nil)
 	    (tramp-barf-if-no-shell-prompt
 	     p 60 "Couldn't find local shell prompt %s" tramp-encoding-shell)