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

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       07/09/28 16:05:49

Index: net/tramp-fish.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp-fish.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- net/tramp-fish.el   29 Jul 2007 15:32:55 -0000      1.5
+++ net/tramp-fish.el   28 Sep 2007 16:05:49 -0000      1.6
@@ -365,7 +365,7 @@
   (unless (file-name-absolute-p name)
     (setq name (concat (file-name-as-directory dir) name)))
   ;; If NAME is not a tramp file, run the real handler
-  (if (or (tramp-completion-mode) (not (tramp-tramp-file-p name)))
+  (if (or (tramp-completion-mode-p) (not (tramp-tramp-file-p name)))
       (tramp-drop-volume-letter
        (tramp-run-real-handler 'expand-file-name (list name nil)))
     ;; Dissect NAME.
@@ -701,10 +701,11 @@
   "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 (process-file
-             "touch" nil nil nil "-t"
+      (zerop (apply
+             'process-file
+             (list "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)
@@ -739,7 +740,7 @@
 (defun tramp-fish-handle-executable-find (command)
   "Like `executable-find' for Tramp files."
   (with-temp-buffer
-    (if (zerop (process-file "which" nil t nil command))
+    (if (zerop (apply 'process-file (list "which" nil t nil command)))
        (progn
          (goto-char (point-min))
          (buffer-substring (point-min) (tramp-line-end-position))))))
@@ -823,7 +824,7 @@
                       v (format
                          "#EXEC %s %s"
                          (tramp-shell-quote-argument command) output))
-               (error))
+               (error nil))
            ;; Check return code.
            (setq tmpfil (file-local-copy
                          (tramp-make-tramp-file-name method user host output)))
@@ -961,7 +962,7 @@
        ;; Read number of entries
        (goto-char (point-min))
        (condition-case nil
-           (unless (integerp (setq num (read (current-buffer)))) (error))
+           (unless (integerp (setq num (read (current-buffer)))) (error nil))
          (error (return nil)))
        (forward-line)
        (delete-region (point-min) (point))
@@ -969,7 +970,7 @@
        ;; Read return code
        (goto-char (point-min))
        (condition-case nil
-           (unless (looking-at tramp-fish-continue-prompt-regexp) (error))
+           (unless (looking-at tramp-fish-continue-prompt-regexp) (error nil))
          (error (return nil)))
        (forward-line)
        (delete-region (point-min) (point))
@@ -986,7 +987,7 @@
        ;; Read return code
        (goto-char (point-min))
        (condition-case nil
-           (unless (looking-at tramp-fish-ok-prompt-regexp) (error))
+           (unless (looking-at tramp-fish-ok-prompt-regexp) (error nil))
          (error (tramp-error
                  vec 'file-error
                  "`%s' does not return a valid Lisp expression: `%s'"
@@ -1071,7 +1072,7 @@
        ;; Read filesize
        (goto-char (point-min))
        (condition-case nil
-           (unless (integerp (setq size (read (current-buffer)))) (error))
+           (unless (integerp (setq size (read (current-buffer)))) (error nil))
          (error (return nil)))
        (forward-line)
        (delete-region (point-min) (point))
@@ -1079,7 +1080,7 @@
        ;; Read return code
        (goto-char (point-min))
        (condition-case nil
-           (unless (looking-at tramp-fish-continue-prompt-regexp) (error))
+           (unless (looking-at tramp-fish-continue-prompt-regexp) (error nil))
          (error (return nil)))
        (forward-line)
        (delete-region (point-min) (point))
@@ -1095,7 +1096,7 @@
        ;; Read return code
        (goto-char (+ (point-min) size))
        (condition-case nil
-           (unless (looking-at tramp-fish-ok-prompt-regexp) (error))
+           (unless (looking-at tramp-fish-ok-prompt-regexp) (error nil))
          (error (return nil)))
        (delete-region (+ (point-min) size) (point-max))
        size))))