[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: |
Wed, 03 Oct 2007 10:54:05 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Michael Albinus <albinus> 07/10/03 10:54:04
Index: net/tramp-fish.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp-fish.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- net/tramp-fish.el 30 Sep 2007 16:43:07 -0000 1.7
+++ net/tramp-fish.el 3 Oct 2007 10:54:03 -0000 1.8
@@ -157,17 +157,6 @@
(require 'tramp-cache)
(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
- (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."
@@ -486,14 +475,14 @@
(tramp-error
v 'file-error
"Cannot make local copy of non-existing file `%s'" filename))
- (let ((tmpfil (tramp-make-temp-file filename)))
- (tramp-message v 4 "Fetching %s to tmp file %s..." filename tmpfil)
+ (let ((tmpfile (tramp-make-temp-file filename)))
+ (tramp-message v 4 "Fetching %s to tmp file %s..." filename tmpfile)
(when (tramp-fish-retrieve-data v)
;; Save file
(with-current-buffer (tramp-get-buffer v)
- (write-region (point-min) (point-max) tmpfil))
- (tramp-message v 4 "Fetching %s to tmp file %s...done" filename tmpfil)
- tmpfil))))
+ (write-region (point-min) (point-max) tmpfile))
+ (tramp-message v 4 "Fetching %s to tmp file %s...done" filename tmpfile)
+ tmpfile))))
;; This function should return "foo/" for directories and "bar" for
;; files.
@@ -746,7 +735,7 @@
(with-parsed-tramp-file-name default-directory nil
(let ((temp-name-prefix (tramp-make-tramp-temp-file v))
- command input output stderr outbuf tmpfil ret)
+ command input output stderr outbuf tmpfile ret)
;; Compute command.
(setq command (mapconcat 'tramp-shell-quote-argument
(cons program args) " "))
@@ -818,19 +807,20 @@
(tramp-shell-quote-argument command) output))
(error nil))
;; Check return code.
- (setq tmpfil (file-local-copy
+ (setq tmpfile
+ (file-local-copy
(tramp-make-tramp-file-name method user host output)))
(with-temp-buffer
- (insert-file-contents tmpfil)
+ (insert-file-contents tmpfile)
(goto-char (point-max))
(forward-line -1)
(looking-at "^###RESULT: \\([0-9]+\\)")
(setq ret (string-to-number (match-string 1)))
(delete-region (point) (point-max))
- (write-region (point-min) (point-max) tmpfil))
+ (write-region (point-min) (point-max) tmpfile))
;; We should show the output anyway.
(when outbuf
- (with-current-buffer outbuf (insert-file-contents tmpfil))
+ (with-current-buffer outbuf (insert-file-contents tmpfile))
(when display (display-buffer outbuf)))
;; Remove output file.
(delete-file (tramp-make-tramp-file-name method user host output)))
- [Emacs-diffs] Changes to emacs/lisp/net/tramp-fish.el,v,
Michael Albinus <=