summaryrefslogtreecommitdiff
path: root/lisp/net/tramp-fish.el
diff options
context:
space:
mode:
authorMichael Albinus <albinus@detlef>2010-04-10 14:50:31 +0200
committerMichael Albinus <albinus@detlef>2010-04-10 14:50:31 +0200
commitb533bc970ca577d3fae6fc1c44d5f4170c32fdca (patch)
tree86fe28b33ba4207771f91abefec0ea6935ce214b /lisp/net/tramp-fish.el
parent5b253e9c5c158330d6df05f56359cf4a98cf3115 (diff)
downloademacs-b533bc970ca577d3fae6fc1c44d5f4170c32fdca.tar.gz
Synchronize with Tramp repository.
* net/tramp.el (tramp-completion-function-alist) (tramp-file-name-regexp, tramp-chunksize) (tramp-local-coding-commands, tramp-remote-coding-commands): Fix docstring. (tramp-remote-process-environment): Use `format' instead of `concat'. (tramp-handle-directory-files-and-attributes) (tramp-get-remote-path): Use `copy-tree'. (tramp-handle-file-name-all-completions): Backward/ XEmacs compatibility: Use `completion-ignore-case' if `read-file-name-completion-ignore-case' does not exist. (tramp-do-copy-or-rename-file-directly): Do not use `tramp-handle-file-remote-p'. (tramp-do-copy-or-rename-file-out-of-band): Use `tramp-compat-delete-directory'. (tramp-do-copy-or-rename-file-out-of-band) (tramp-compute-multi-hops, tramp-maybe-open-connection): Use `format-spec-make'. (tramp-find-foreign-file-name-handler) (tramp-advice-make-auto-save-file-name) (tramp-set-auto-save-file-modes): Remove superfluous check for `stringp'. This is done inside `tramp-tramp-file-p'. (tramp-debug-outline-regexp): New defconst. (tramp-get-debug-buffer): Use it. (tramp-check-for-regexp): Use (forward-line 1). (tramp-set-auto-save-file-modes): Adapt version check. * net/tramp-compat.el (tramp-advice-file-expand-wildcards): Wrap call of `featurep' for 2nd argument. (tramp-compat-make-temp-file): Simplify fallback implementation. (tramp-compat-copy-tree): Remove function. (tramp-compat-delete-directory): Provide implementation for older Emacsen. * net/tramp-fish.el (tramp-fish-handle-directory-files-and-attributes): Do not use `tramp-fish-handle-file-attributes. * net/trampver.el: Update release number.
Diffstat (limited to 'lisp/net/tramp-fish.el')
-rw-r--r--lisp/net/tramp-fish.el14
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/net/tramp-fish.el b/lisp/net/tramp-fish.el
index 582aeb4dd74..e3607fa114a 100644
--- a/lisp/net/tramp-fish.el
+++ b/lisp/net/tramp-fish.el
@@ -341,10 +341,10 @@ pass to the OPERATION."
"Like `directory-files-and-attributes' for Tramp files."
(mapcar
(lambda (x)
- ;; We cannot call `file-attributes' for backward compatibility reasons.
- ;; Its optional parameter ID-FORMAT is introduced with Emacs 22.
- (cons x (tramp-fish-handle-file-attributes
- (if full x (expand-file-name x directory)) id-format)))
+ (cons x
+ (tramp-compat-file-attributes
+ (if full x (expand-file-name x directory))
+ id-format)))
(directory-files directory full match nosort)))
(defun tramp-fish-handle-expand-file-name (name &optional dir)
@@ -1030,15 +1030,15 @@ SIZE MODE WEIRD)."
;; last line
((looking-at "^$")
(return)))
- ;; delete line
+ ;; Delete line.
(forward-line)
(delete-region (point-min) (point))))
- ;; delete trailing empty line
+ ;; Delete trailing empty line.
(forward-line)
(delete-region (point-min) (point))
- ;; Return entry in file-attributes format
+ ;; Return entry in `file-attributes' format.
(list localname link -1 uid gid '(0 0) mtime '(0 0) size mode nil)))
(defun tramp-fish-retrieve-data (vec)