[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/net/tramp-fish.el,v
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/net/tramp-fish.el,v |
Date: |
Sun, 30 Sep 2007 16:43:09 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Michael Albinus <albinus> 07/09/30 16:43:07
Index: net/tramp-fish.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp-fish.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- net/tramp-fish.el 28 Sep 2007 16:05:49 -0000 1.6
+++ net/tramp-fish.el 30 Sep 2007 16:43:07 -0000 1.7
@@ -155,26 +155,19 @@
(require 'tramp)
(require 'tramp-cache)
-
-;; Pacify byte-compiler
-(eval-when-compile
- (require 'cl)
- (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 'tramp-compat)
;; `directory-sep-char' is an obsolete variable in Emacs. But it is
;; used in XEmacs, so we set it here and there. The following is needed
;; to pacify Emacs byte-compiler.
(eval-when-compile
- (unless (boundp 'byte-compile-not-obsolete-var)
- (defvar byte-compile-not-obsolete-var nil))
(setq byte-compile-not-obsolete-var 'directory-sep-char))
+;; Pacify byte-compiler
+(eval-when-compile
+ (require 'cl)
+ (require 'custom))
+
;; Define FISH method ...
(defcustom tramp-fish-method "fish"
"*Method to connect via FISH protocol."
@@ -386,7 +379,7 @@
(tramp-fish-send-command-and-check v "#PWD")
(with-current-buffer (tramp-get-buffer v)
(goto-char (point-min))
- (buffer-substring (point) (tramp-line-end-position)))))
+ (buffer-substring (point) (tramp-compat-line-end-position)))))
(setq localname (concat uname fname))))
;; There might be a double slash, for example when "~/"
;; expands to "/". Remove this.
@@ -399,7 +392,7 @@
;; bound, because on Windows there would be problems with UNC
;; shares or Cygwin mounts.
(tramp-let-maybe directory-sep-char ?/
- (let ((default-directory (tramp-temporary-file-directory)))
+ (let ((default-directory (tramp-compat-temporary-file-directory)))
(tramp-make-tramp-file-name
method user host
(tramp-drop-volume-letter
@@ -701,11 +694,10 @@
"Like `set-file-times' for Tramp files."
(with-parsed-tramp-file-name filename nil
(let ((time (if (or (null time) (equal time '(0 0))) (current-time) time)))
- (zerop (apply
- 'process-file
- (list "touch" nil nil nil "-t"
+ (zerop (process-file
+ "touch" nil nil nil "-t"
(format-time-string "%Y%m%d%H%M.%S" time)
- (tramp-shell-quote-argument localname)))))))
+ (tramp-shell-quote-argument localname))))))
(defun tramp-fish-handle-write-region
(start end filename &optional append visit lockname confirm)
@@ -740,10 +732,10 @@
(defun tramp-fish-handle-executable-find (command)
"Like `executable-find' for Tramp files."
(with-temp-buffer
- (if (zerop (apply 'process-file (list "which" nil t nil command)))
+ (if (zerop (process-file "which" nil t nil command))
(progn
(goto-char (point-min))
- (buffer-substring (point-min) (tramp-line-end-position))))))
+ (buffer-substring (point-min) (tramp-compat-line-end-position))))))
(defun tramp-fish-handle-process-file
(program &optional infile destination display &rest args)
@@ -936,7 +928,7 @@
(tramp-shell-quote-argument v2-localname)))))
;; KEEP-DATE handling.
(when (and keep-date (functionp 'set-file-times))
- (apply 'set-file-times (list newname (nth 5 (file-attributes filename)))))
+ (set-file-times newname (nth 5 (file-attributes filename))))
;; Set the mode.
(set-file-modes newname (file-modes filename)))
@@ -1133,7 +1125,8 @@
(coding-system-for-read 'binary)
(coding-system-for-write 'binary)
;; This must be done in order to avoid our file name handler.
- (p (let ((default-directory (tramp-temporary-file-directory)))
+ (p (let ((default-directory
+ (tramp-compat-temporary-file-directory)))
(start-process
(or (tramp-get-connection-property vec "process-name" nil)
(tramp-buffer-name vec))