Commit 8ca864ba authored by Michael Albinus's avatar Michael Albinus

Sync with Tramp 2.2.13

* doc/misc/trampver.texi: Change version to "".

* lisp/net/tramp-compat.el (tramp-compat-delete-dups):
Use `tramp-compat-funcall'.

* lisp/net/tramp-gvfs.el (tramp-gvfs-parse-device-names):
Make `split-string' call compatible with older Emacsen.

* lisp/net/trampver.el: Change version to "".
parent 959ce527
......@@ -8,7 +8,7 @@
@c In the Tramp GIT, the version number is auto-frobbed from
@c, so you should edit that file and run
@c "autoconf && ./configure" to change the version number.
@set trampver 2.2.13-25.1
@set trampver
@c Other flags from configuration
@set instprefix /usr/local
......@@ -600,7 +600,8 @@ and replace a sub-expression, e.g.
Store the result in LIST and return it. LIST must be a proper list.
Of several `equal' occurrences of an element in LIST, the first
one is kept."
(cl-delete-duplicates list '(:test equal :from-end) nil)))
'cl-delete-duplicates list '(:test equal :from-end) nil)))
(add-hook 'tramp-unload-hook
(lambda ()
......@@ -1740,20 +1740,25 @@ be used."
(list user host)))
(zeroconf-list-services service)))
;; We use the TRIM argument of `split-string', which exist since Emacs
;; 24.4. I mask this for older Emacs versions, there is no harm.
(defun tramp-gvfs-parse-device-names (service)
"Return a list of (user host) tuples allowed to access.
This uses \"avahi-browse\" in case D-Bus is not enabled in Avahi."
(let ((result
(shell-command-to-string (format "avahi-browse -trkp %s" service))
"[\n\r]+" 'omit "^\\+;.*$")))
(shell-command-to-string (format "avahi-browse -trkp %s" service))
"[\n\r]+" 'omit "^\\+;.*$"))))
(lambda (x)
(let* ((list (split-string x ";"))
(host (nth 6 list))
(port (nth 8 list))
(text (split-string (nth 9 list) "\" \"" 'omit "\""))
(text (tramp-compat-funcall
'split-string (nth 9 list) "\" \"" 'omit "\""))
; (when (and port (not (string-equal port "0")))
; (setq host (format "%s%s%s" host tramp-prefix-port-regexp port)))
......@@ -5425,9 +5425,6 @@ Return ATTR."
(with-tramp-connection-property vec "ls-quoting-style"
(tramp-message vec 5 "Checking, whether `ls --quoting-style=shell' works")
;; Some "ls" versions are sensible wrt the order of arguments,
;; they fail when "-al" is after the "--dired" argument (for
;; example on FreeBSD).
vec (format "%s --quoting-style=shell -al /dev/null"
(tramp-get-ls-command vec))))))
......@@ -5436,7 +5433,9 @@ Return ATTR."
(with-tramp-connection-property vec "ls-w-option"
(tramp-message vec 5 "Checking, whether `ls -w' works")
;; Option "-w" is available on BSD systems.
;; Option "-w" is available on BSD systems. No argument is
;; given, because this could return wrong results in case "ls"
;; supports the "-w NUM" argument, as for busyboxes.
vec (format "%s -alw" (tramp-get-ls-command vec))))))
......@@ -63,7 +63,7 @@
(= emacs-major-version 21)
(>= emacs-minor-version 4)))
(format "Tramp 2.2.13-pre is not fit for %s"
(format "Tramp is not fit for %s"
(when (string-match "^.*$" (emacs-version))
(match-string 0 (emacs-version)))))))
(unless (string-match "\\`ok\\'" x) (error "%s" x)))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment