
* doc/misc/tramp.texi (Overview): Use "scp" in example. (Obtaining @value{tramp}): Prefer https: to git: URIs on Savannah. (Ssh setup): Extend for MS Windows and ssh. Explain tramp-use-ssh-controlmaster-options value `suppress'. (File name completion): Remove completion styles restrictions. (Ad-hoc multi-hops): Describe tramp-show-ad-hoc-proxies. (Remote processes): Add reference to "Using ssh connection sharing". * doc/misc/trampver.texi: * lisp/net/trampver.el (tramp-version): Set to "2.6.2-pre". * lisp/net/tramp-adb.el (tramp-adb-handle-file-name-all-completions): * lisp/net/tramp-archive.el (tramp-archive-handle-file-name-all-completions): * lisp/net/tramp-crypt.el (tramp-crypt-handle-file-name-all-completions): * lisp/net/tramp-fuse.el (tramp-fuse-handle-file-name-all-completions): * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-file-name-all-completions): * lisp/net/tramp-sh.el (tramp-sh-handle-file-name-all-completions): * lisp/net/tramp-smb.el (tramp-smb-handle-file-name-all-completions): * lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-file-name-all-completions): Return nil when DIRECTORY is missing. (Bug#61890) * lisp/net/tramp.el (tramp-accept-process-output): Don't use TIMEOUT anymore, default it to 0. When the connection uses a shared socket possibly, accept also the output from other processes over the same connection. (Bug#61350) (tramp-handle-file-notify-rm-watch, tramp-action-process-alive) (tramp-action-out-of-band, tramp-process-one-action) (tramp-interrupt-process): * lisp/net/tramp-adb.el (tramp-adb-handle-make-process): * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-file-notify-add-watch): * lisp/net/tramp-sh.el (tramp-sh-handle-file-notify-add-watch): * lisp/net/tramp-smb.el (tramp-smb-action-get-acl) (tramp-smb-action-set-acl, tramp-smb-wait-for-output): * lisp/net/tramp-sudoedit.el (tramp-sudoedit-action-sudo): Adapt callees. * lisp/net/tramp.el (tramp-get-process, tramp-message) (tramp-handle-make-process, tramp-handle-file-notify-valid-p) (tramp-process-actions, tramp-accept-process-output) (tramp-process-sentinel, tramp-read-passwd) (tramp-interrupt-process, tramp-signal-process): * lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection): * lisp/net/tramp-cmds.el (tramp-cleanup-connection): * lisp/net/tramp-crypt.el (tramp-crypt-maybe-open-connection): * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-file-notify-add-watch) (tramp-gvfs-monitor-process-filter) (tramp-gvfs-maybe-open-connection): * lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection): * lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band) (tramp-sh-handle-file-notify-add-watch) (tramp-sh-gio-monitor-process-filter) (tramp-sh-inotifywait-process-filter) (tramp-barf-if-no-shell-prompt, tramp-maybe-open-connection): * lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory) (tramp-smb-handle-file-acl, tramp-smb-handle-set-file-acl) (tramp-smb-maybe-open-connection): * lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection): * lisp/net/tramp-sudoedit.el (tramp-sudoedit-maybe-open-connection) (tramp-sudoedit-send-command): Prefix internal process properties with "tramp-". * lisp/net/tramp.el (tramp-skeleton-file-exists-p): New defmacro, which also handles host name completion. (tramp-handle-file-exists-p): * lisp/net/tramp-adb.el (tramp-adb-handle-file-exists-p): * lisp/net/tramp-sh.el (tramp-sh-handle-file-exists-p): * lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-file-exists-p): Use it. * lisp/net/tramp.el (tramp-wrong-passwd-regexp): * lisp/net/tramp-adb.el (tramp-adb-prompt): * lisp/net/tramp-sh.el (tramp-sh-inotifywait-process-filter): * lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection): Unify regexps. * lisp/net/tramp.el: * lisp/net/tramp-cmds.el: * lisp/net/tramp-crypt.el: * lisp/net/tramp-gvfs.el: * lisp/net/tramp-sh.el: * lisp/net/tramp-smb.el: Fix error messages. * lisp/net/tramp-cmds.el (tramp-cleanup-connection): Protect `delete-process'. * lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp) (tramp-method-regexp, tramp-postfix-method-format) (tramp-postfix-method-regexp, tramp-prefix-ipv6-format) (tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format) (tramp-postfix-ipv6-regexp, tramp-postfix-host-format) (tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp) (tramp-file-name-structure, tramp-file-name-regexp) (tramp-completion-method-regexp) (tramp-completion-file-name-regexp): * lisp/net/tramp-compat.el (tramp-syntax): * lisp/net/tramp-gvfs.el (tramp-gvfs-dbus-event-vector): Rearrange declarations. * lisp/net/tramp-compat.el (ansi-color): Require. (ls-lisp): Don't require. (Bug#64124) (tramp-compat-replace-regexp-in-region): Move up. (tramp-compat-length<, tramp-compat-length>) (tramp-compat-length=): New defaliases. (tramp-compat-file-name-unquote, tramp-compat-take) (tramp-compat-ntake): Use them. * lisp/net/tramp-container.el (tramp-container--completion-function): Rename from `tramp-docker--completion-function'. Add argument PROGRAM. Use it for "docker" and "podman" host name completion. * lisp/net/tramp-crypt.el (tramp-crypt-handle-file-exists-p): New defun. (tramp-crypt-file-name-handler-alist): Add it. * lisp/net/tramp-fuse.el (tramp-fuse-handle-file-exists-p): New defun. (tramp-fuse-mount-timeout): Move up. (tramp-fuse-mount-point): Use `tramp-fuse-mount-timeout'. (tramp-fuse-unmount): Flush "mount-point" file property. (tramp-fuse-mount-point, tramp-fuse-mounted-p): Support existing mount points. (tramp-fuse-mounted-p): The mount-spec could contain an optional trailing slash. (Bug#64278) * lisp/net/tramp-gvfs.el (tramp-gvfs-do-copy-or-rename-file) * lisp/net/tramp-rclone.el (tramp-rclone-do-copy-or-rename-file): Improve stability for WebDAV. (tramp-rclone-handle-file-system-info): Check return code of command. * lisp/net/tramp-gvfs.el (while-no-input-ignore-events): Add `dbus-event' for older Emacs versions. (tramp-gvfs-parse-device-names): Ignore errors. * lisp/net/tramp-sh.el (tramp-display-escape-sequence-regexp) (tramp-device-escape-sequence-regexp): Delete. (tramp-sh-handle-insert-directory, tramp-barf-if-no-shell-prompt) (tramp-wait-for-output): Use `ansi-color-control-seq-regexp'. (tramp-use-ssh-controlmaster-options): Allow new value `suppress'. (tramp-ssh-option-exists-p): New defun. (tramp-ssh-controlmaster-options): Implement `suppress' actions. Should never return nil, but empty string. (tramp-perl-file-name-all-completions): Don't print status message. (tramp-sh-handle-file-name-all-completions): Return nil when check fails. (Bug#61890) (tramp-run-test): Add VEC argument. (tramp-sh-handle-file-executable-p) (tramp-sh-handle-file-readable-p) (tramp-sh-handle-file-directory-p) (tramp-sh-handle-file-writable-p): Adapt callees. (tramp-sh-handle-insert-directory): (tramp-sh-handle-insert-directory): Test whether -N is understood by ls since that option is used along with --dired. Remove -N when we remove --dired. (Bug#63142) (tramp-sh-handle-insert-directory, tramp-barf-if-no-shell-prompt) (tramp-wait-for-output): Use `ansi-color-control-seq-regexp'. (tramp-sh-handle-expand-file-name): `null-device' could be nil. Reported by Richard Copley <rcopley@gmail.com>. (tramp-sh-handle-make-process): Improve handling of connection-type `pipe'. (Bug#61341) * lisp/net/tramp-smb.el (tramp-smb-handle-make-symbolic-link): * lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-make-symbolic-link): Flush TARGET file properties. * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file): Flush proper file properties. (tramp-smb-handle-file-acl, tramp-smb-handle-set-file-acl): Remove superfluous `unwind-protect'. * lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist): Use `tramp-fuse-handle-file-exists-p'. (tramp-sshfs-handle-insert-file-contents): Move result out of unwindform. * lisp/net/tramp.el (tramp-string-empty-or-nil-p): New defsubst. Use it everywhere when appropriate. * lisp/net/tramp.el (tramp-methods) <->: Add. (tramp-completion-file-name-handler-alist): Add `expand-file-name', `file-exists-p', `file-name-directory' and `file-name-nondirectory'. (tramp-dissect-file-name): Do not extra check for `tramp-default-method-marker'. (tramp-completion-handle-expand-file-name) (tramp-completion-handle-file-exists-p) (tramp-completion-handle-file-name-directory) (tramp-completion-handle-file-name-nondirectory): New defuns. (tramp-completion-handle-file-name-all-completions): Remove duplicates. (tramp-show-ad-hoc-proxies): New defcustom. (tramp-make-tramp-file-name): Use it. (tramp-make-tramp-hop-name): Don't add hop twice. (tramp-shell-prompt-pattern): Remove escape characters. (tramp-process-one-action, tramp-convert-file-attributes): Use `ansi-color-control-seq-regexp'. (Bug#63539) (tramp-wrong-passwd-regexp): Add "Authentication failed" string (from doas). (tramp-terminal-type): Fix docstring. (tramp-process-one-action): Delete ANSI control escape sequences in buffer. (Bug#63539) (tramp-build-completion-file-name-regexp): Support user name completion. (tramp-make-tramp-file-name): Keep hop while in file (tramp-set-completion-function): Check, that cdr of FUNCTION-LIST entries is a string. (tramp-completion-file-name-handler): Run only when `minibuffer-completing-file-name' is non-nil. (tramp-skeleton-write-region): Fix scoping. (Bug#65022) (tramp-handle-memory-info): Work on newly created objects, or use non-destructive operations. (tramp-accept-process-output): Use `with-local-quit'. (tramp-call-process, tramp-call-process-region): Let-bind `temporary-file-directory'. * test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs28-p): New defun. (tramp-archive-test16-directory-files): Don't mutate. (tramp-archive-test47-auto-load): Adapt test. * test/lisp/net/tramp-tests.el (tramp-display-escape-sequence-regexp): Dont't declare. (tramp-action-yesno): Suppress run in tests. (tramp-test02-file-name-dissect): (tramp-test02-file-name-dissect-simplified) (tramp-test02-file-name-dissect-separate): Adapt tests. (tramp-test21-file-links): (tramp-test21-file-links, tramp-test26-file-name-completion) (tramp-test28-process-file, tramp-test29-start-file-process) (tramp-test30-make-process, tramp-test33-environment-variables) (tramp-test38-find-backup-file-name, tramp-test47-auto-load) (tramp-test39-detect-external-change, tramp-test42-utf8) (tramp-test47-auto-load, tramp-test47-delay-load) (tramp-test48-unload): Adapt tests. (tramp-test26-file-name-completion-with-perl): (tramp-test26-file-name-completion-with-ls) (tramp-test26-interactive-file-name-completion): New tests. (tramp-test44-asynchronous-requests): Mark as :unstable.
446 lines
16 KiB
EmacsLisp
446 lines
16 KiB
EmacsLisp
;;; tramp-compat.el --- Tramp compatibility functions -*- lexical-binding:t -*-
|
|
|
|
;; Copyright (C) 2007-2023 Free Software Foundation, Inc.
|
|
|
|
;; Author: Michael Albinus <michael.albinus@gmx.de>
|
|
;; Keywords: comm, processes
|
|
;; Package: tramp
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Tramp's main Emacs version for development is Emacs 29. This
|
|
;; package provides compatibility functions for Emacs 26, Emacs 27 and
|
|
;; Emacs 28.
|
|
|
|
;;; Code:
|
|
|
|
(require 'ansi-color)
|
|
(require 'auth-source)
|
|
(require 'format-spec)
|
|
(require 'parse-time)
|
|
(require 'shell)
|
|
(require 'subr-x)
|
|
|
|
(declare-function tramp-compat-rx "tramp")
|
|
(declare-function tramp-error "tramp")
|
|
(declare-function tramp-file-name-handler "tramp")
|
|
(declare-function tramp-tramp-file-p "tramp")
|
|
(defvar tramp-syntax)
|
|
(defvar tramp-temp-name-prefix)
|
|
|
|
(defconst tramp-compat-emacs-compiled-version (eval-when-compile emacs-version)
|
|
"The Emacs version used for compilation.")
|
|
|
|
(unless (= emacs-major-version
|
|
(car (version-to-list tramp-compat-emacs-compiled-version)))
|
|
(warn "Tramp has been compiled with Emacs %s, this is Emacs %s"
|
|
tramp-compat-emacs-compiled-version emacs-version))
|
|
|
|
(with-eval-after-load 'docker-tramp
|
|
(warn (concat "Package `docker-tramp' has been obsoleted, "
|
|
"please use integrated package `tramp-container'")))
|
|
(with-eval-after-load 'kubernetes-tramp
|
|
(warn (concat "Package `kubernetes-tramp' has been obsoleted, "
|
|
"please use integrated package `tramp-container'")))
|
|
|
|
;; For not existing functions, obsolete functions, or functions with a
|
|
;; changed argument list, there are compiler warnings. We want to
|
|
;; avoid them in cases we know what we do.
|
|
(defmacro tramp-compat-funcall (function &rest arguments)
|
|
"Call FUNCTION with ARGUMENTS if it exists. Do not raise compiler warnings."
|
|
`(when (functionp ,function)
|
|
(with-no-warnings (funcall ,function ,@arguments))))
|
|
|
|
;; We must use a local directory. If it is remote, we could run into
|
|
;; an infloop.
|
|
(defconst tramp-compat-temporary-file-directory
|
|
(eval (car (get 'temporary-file-directory 'standard-value)) t)
|
|
"The default value of `temporary-file-directory'.")
|
|
|
|
(defsubst tramp-compat-make-temp-name ()
|
|
"Generate a local temporary file name (compat function)."
|
|
(make-temp-name
|
|
(expand-file-name
|
|
tramp-temp-name-prefix tramp-compat-temporary-file-directory)))
|
|
|
|
(defsubst tramp-compat-make-temp-file (f &optional dir-flag)
|
|
"Create a local temporary file (compat function).
|
|
Add the extension of F, if existing."
|
|
(make-temp-file
|
|
(expand-file-name
|
|
tramp-temp-name-prefix tramp-compat-temporary-file-directory)
|
|
dir-flag (file-name-extension f t)))
|
|
|
|
;; `file-name-quoted-p', `file-name-quote' and `file-name-unquote' got
|
|
;; a second argument in Emacs 27.1.
|
|
;;;###tramp-autoload
|
|
(defalias 'tramp-compat-file-name-quoted-p
|
|
(if (equal (func-arity #'file-name-quoted-p) '(1 . 2))
|
|
#'file-name-quoted-p
|
|
(lambda (name &optional top)
|
|
"Whether NAME is quoted with prefix \"/:\".
|
|
If NAME is a remote file name and TOP is nil, check the local part of NAME."
|
|
(let ((file-name-handler-alist (unless top file-name-handler-alist)))
|
|
(string-prefix-p "/:" (file-local-name name))))))
|
|
|
|
(defalias 'tramp-compat-file-name-quote
|
|
(if (equal (func-arity #'file-name-quote) '(1 . 2))
|
|
#'file-name-quote
|
|
(lambda (name &optional top)
|
|
"Add the quotation prefix \"/:\" to file NAME.
|
|
If NAME is a remote file name and TOP is nil, the local part of NAME is quoted."
|
|
(let ((file-name-handler-alist (unless top file-name-handler-alist)))
|
|
(if (tramp-compat-file-name-quoted-p name top)
|
|
name
|
|
(concat (file-remote-p name) "/:" (file-local-name name)))))))
|
|
|
|
(defalias 'tramp-compat-file-name-unquote
|
|
(if (equal (func-arity #'file-name-unquote) '(1 . 2))
|
|
#'file-name-unquote
|
|
(lambda (name &optional top)
|
|
"Remove quotation prefix \"/:\" from file NAME.
|
|
If NAME is a remote file name and TOP is nil, the local part of
|
|
NAME is unquoted."
|
|
(let* ((file-name-handler-alist (unless top file-name-handler-alist))
|
|
(localname (file-local-name name)))
|
|
(when (tramp-compat-file-name-quoted-p localname top)
|
|
(setq
|
|
localname
|
|
(if (tramp-compat-length= localname 2) "/" (substring localname 2))))
|
|
(concat (file-remote-p name) localname)))))
|
|
|
|
;; `tramp-syntax' has changed its meaning in Emacs 26.1. We still
|
|
;; support old settings.
|
|
(defsubst tramp-compat-tramp-syntax ()
|
|
"Return proper value of `tramp-syntax'."
|
|
(cond ((eq tramp-syntax 'ftp) 'default)
|
|
((eq tramp-syntax 'sep) 'separate)
|
|
(t tramp-syntax)))
|
|
|
|
;; The signature of `tramp-make-tramp-file-name' has been changed.
|
|
;; Therefore, we cannot use `url-tramp-convert-url-to-tramp' prior
|
|
;; Emacs 26.1. We use `temporary-file-directory' as indicator.
|
|
(defconst tramp-compat-use-url-tramp-p (fboundp 'temporary-file-directory)
|
|
"Whether to use url-tramp.el.")
|
|
|
|
;; `exec-path' is new in Emacs 27.1.
|
|
(defalias 'tramp-compat-exec-path
|
|
(if (fboundp 'exec-path)
|
|
#'exec-path
|
|
(lambda ()
|
|
"List of directories to search programs to run in remote subprocesses."
|
|
(if (tramp-tramp-file-p default-directory)
|
|
(tramp-file-name-handler 'exec-path)
|
|
exec-path))))
|
|
|
|
;; `time-equal-p' has appeared in Emacs 27.1.
|
|
(defalias 'tramp-compat-time-equal-p
|
|
(if (fboundp 'time-equal-p)
|
|
#'time-equal-p
|
|
(lambda (t1 t2)
|
|
"Return non-nil if time value T1 is equal to time value T2.
|
|
A nil value for either argument stands for the current time."
|
|
(equal (or t1 (current-time)) (or t2 (current-time))))))
|
|
|
|
;; `flatten-tree' has appeared in Emacs 27.1.
|
|
(defalias 'tramp-compat-flatten-tree
|
|
(if (fboundp 'flatten-tree)
|
|
#'flatten-tree
|
|
(lambda (tree)
|
|
"Take TREE and \"flatten\" it."
|
|
(let (elems)
|
|
(setq tree (list tree))
|
|
(while (let ((elem (pop tree)))
|
|
(cond ((consp elem)
|
|
(setq tree (cons (car elem) (cons (cdr elem) tree))))
|
|
(elem
|
|
(push elem elems)))
|
|
tree))
|
|
(nreverse elems)))))
|
|
|
|
;; `progress-reporter-update' got argument SUFFIX in Emacs 27.1.
|
|
(defalias 'tramp-compat-progress-reporter-update
|
|
(if (equal (func-arity #'progress-reporter-update) '(1 . 3))
|
|
#'progress-reporter-update
|
|
(lambda (reporter &optional value _suffix)
|
|
(progress-reporter-update reporter value))))
|
|
|
|
;; `ignore-error' is new in Emacs 27.1.
|
|
(defmacro tramp-compat-ignore-error (condition &rest body)
|
|
"Execute BODY; if the error CONDITION occurs, return nil.
|
|
Otherwise, return result of last form in BODY.
|
|
|
|
CONDITION can also be a list of error conditions."
|
|
(declare (debug t) (indent 1))
|
|
`(condition-case nil (progn ,@body) (,condition nil)))
|
|
|
|
;; `rx' in Emacs 26 doesn't know the `literal', `anychar' and
|
|
;; `multibyte' constructs. The `not' construct requires an `any'
|
|
;; construct as argument. The `regexp' construct requires a literal
|
|
;; string.
|
|
(defvar tramp-compat-rx--runtime-params)
|
|
|
|
(defun tramp-compat-rx--transform-items (items)
|
|
(mapcar #'tramp-compat-rx--transform-item items))
|
|
|
|
;; There is an error in Emacs 26. `(rx "a" (? ""))' => "a?".
|
|
;; We must protect the string in regexp and literal, therefore.
|
|
(defun tramp-compat-rx--transform-item (item)
|
|
(pcase item
|
|
('anychar 'anything)
|
|
('multibyte 'nonascii)
|
|
(`(not ,expr)
|
|
(if (consp expr) item (list 'not (list 'any expr))))
|
|
(`(regexp ,expr)
|
|
(setq tramp-compat-rx--runtime-params t)
|
|
`(regexp ,(list '\, `(concat "\\(?:" ,expr "\\)"))))
|
|
(`(literal ,expr)
|
|
(setq tramp-compat-rx--runtime-params t)
|
|
`(regexp ,(list '\, `(concat "\\(?:" (regexp-quote ,expr) "\\)"))))
|
|
(`(eval . ,_) item)
|
|
(`(,head . ,rest) (cons head (tramp-compat-rx--transform-items rest)))
|
|
(_ item)))
|
|
|
|
(defun tramp-compat-rx--transform (items)
|
|
(let* ((tramp-compat-rx--runtime-params nil)
|
|
(new-rx (cons ': (tramp-compat-rx--transform-items items))))
|
|
(if tramp-compat-rx--runtime-params
|
|
`(rx-to-string ,(list '\` new-rx) t)
|
|
(rx-to-string new-rx t))))
|
|
|
|
(if (ignore-errors (rx-to-string '(literal "a"))) ;; Emacs 27+.
|
|
(defalias 'tramp-compat-rx #'rx)
|
|
(defmacro tramp-compat-rx (&rest items)
|
|
(tramp-compat-rx--transform items)))
|
|
|
|
;; This is needed for compilation in the Emacs source tree.
|
|
;;;###autoload (defalias 'tramp-compat-rx #'rx)
|
|
|
|
(put #'tramp-compat-rx 'tramp-autoload t)
|
|
|
|
;; `file-modes', `set-file-modes' and `set-file-times' got argument
|
|
;; FLAG in Emacs 28.1.
|
|
(defalias 'tramp-compat-file-modes
|
|
(if (equal (func-arity #'file-modes) '(1 . 2))
|
|
#'file-modes
|
|
(lambda (filename &optional _flag)
|
|
(file-modes filename))))
|
|
|
|
(defalias 'tramp-compat-set-file-modes
|
|
(if (equal (func-arity #'set-file-modes) '(2 . 3))
|
|
#'set-file-modes
|
|
(lambda (filename mode &optional _flag)
|
|
(set-file-modes filename mode))))
|
|
|
|
(defalias 'tramp-compat-set-file-times
|
|
(if (equal (func-arity #'set-file-times) '(1 . 3))
|
|
#'set-file-times
|
|
(lambda (filename &optional timestamp _flag)
|
|
(set-file-times filename timestamp))))
|
|
|
|
;; `directory-files' and `directory-files-and-attributes' got argument
|
|
;; COUNT in Emacs 28.1.
|
|
(defalias 'tramp-compat-directory-files
|
|
(if (equal (func-arity #'directory-files) '(1 . 5))
|
|
#'directory-files
|
|
(lambda (directory &optional full match nosort _count)
|
|
(directory-files directory full match nosort))))
|
|
|
|
(defalias 'tramp-compat-directory-files-and-attributes
|
|
(if (equal (func-arity #'directory-files-and-attributes) '(1 . 6))
|
|
#'directory-files-and-attributes
|
|
(lambda (directory &optional full match nosort id-format _count)
|
|
(directory-files-and-attributes directory full match nosort id-format))))
|
|
|
|
;; `directory-empty-p' is new in Emacs 28.1.
|
|
(defalias 'tramp-compat-directory-empty-p
|
|
(if (fboundp 'directory-empty-p)
|
|
#'directory-empty-p
|
|
(lambda (dir)
|
|
(and (file-directory-p dir)
|
|
(null (tramp-compat-directory-files
|
|
dir nil directory-files-no-dot-files-regexp t 1))))))
|
|
|
|
;; Function `null-device' is new in Emacs 28.1.
|
|
(defalias 'tramp-compat-null-device
|
|
(if (fboundp 'null-device)
|
|
#'null-device
|
|
(lambda ()
|
|
(if (tramp-tramp-file-p default-directory) "/dev/null" null-device))))
|
|
|
|
;; Function `string-replace' is new in Emacs 28.1.
|
|
(defalias 'tramp-compat-string-replace
|
|
(if (fboundp 'string-replace)
|
|
#'string-replace
|
|
(lambda (from-string to-string in-string)
|
|
(let (case-fold-search)
|
|
(replace-regexp-in-string
|
|
(regexp-quote from-string) to-string in-string t t)))))
|
|
|
|
;; Function `string-search' is new in Emacs 28.1.
|
|
(defalias 'tramp-compat-string-search
|
|
(if (fboundp 'string-search)
|
|
#'string-search
|
|
(lambda (needle haystack &optional start-pos)
|
|
(let (case-fold-search)
|
|
(string-match-p (regexp-quote needle) haystack start-pos)))))
|
|
|
|
;; Function `make-lock-file-name' is new in Emacs 28.1.
|
|
(defalias 'tramp-compat-make-lock-file-name
|
|
(if (fboundp 'make-lock-file-name)
|
|
#'make-lock-file-name
|
|
(lambda (filename)
|
|
(expand-file-name
|
|
(concat
|
|
".#" (file-name-nondirectory filename))
|
|
(file-name-directory filename)))))
|
|
|
|
;; Function `file-name-concat' is new in Emacs 28.1.
|
|
(defalias 'tramp-compat-file-name-concat
|
|
(if (fboundp 'file-name-concat)
|
|
#'file-name-concat
|
|
(lambda (directory &rest components)
|
|
(let ((components (cl-remove-if (lambda (el)
|
|
(or (null el) (equal "" el)))
|
|
components))
|
|
file-name-handler-alist)
|
|
(if (null components)
|
|
directory
|
|
(apply #'tramp-compat-file-name-concat
|
|
(concat (unless (or (equal "" directory) (null directory))
|
|
(file-name-as-directory directory))
|
|
(car components))
|
|
(cdr components)))))))
|
|
|
|
;; Function `replace-regexp-in-region' is new in Emacs 28.1.
|
|
(defalias 'tramp-compat-replace-regexp-in-region
|
|
(if (fboundp 'replace-regexp-in-region)
|
|
#'replace-regexp-in-region
|
|
(lambda (regexp replacement &optional start end)
|
|
(if start
|
|
(when (< start (point-min))
|
|
(error "Start before start of buffer"))
|
|
(setq start (point)))
|
|
(if end
|
|
(when (> end (point-max))
|
|
(error "End after end of buffer"))
|
|
(setq end (point-max)))
|
|
(save-excursion
|
|
(let ((matches 0)
|
|
(case-fold-search nil))
|
|
(goto-char start)
|
|
(while (re-search-forward regexp end t)
|
|
(replace-match replacement t)
|
|
(setq matches (1+ matches)))
|
|
(and (not (zerop matches))
|
|
matches))))))
|
|
|
|
;; `length<', `length>' and `length=' are added to Emacs 28.1.
|
|
(defalias 'tramp-compat-length<
|
|
(if (fboundp 'length<)
|
|
#'length<
|
|
(lambda (sequence length)
|
|
(< (length sequence) length))))
|
|
|
|
(defalias 'tramp-compat-length>
|
|
(if (fboundp 'length>)
|
|
#'length>
|
|
(lambda (sequence length)
|
|
(> (length sequence) length))))
|
|
|
|
(defalias 'tramp-compat-length=
|
|
(if (fboundp 'length=)
|
|
#'length=
|
|
(lambda (sequence length)
|
|
(= (length sequence) length))))
|
|
|
|
;; `permission-denied' is introduced in Emacs 29.1.
|
|
(defconst tramp-permission-denied
|
|
(if (get 'permission-denied 'error-conditions) 'permission-denied 'file-error)
|
|
"The error symbol for the `permission-denied' error.")
|
|
|
|
(defsubst tramp-compat-permission-denied (vec file)
|
|
"Emit the `permission-denied' error."
|
|
(if (get 'permission-denied 'error-conditions)
|
|
(tramp-error vec tramp-permission-denied file)
|
|
(tramp-error vec tramp-permission-denied "Permission denied: %s" file)))
|
|
|
|
;; Function `auth-info-password' is new in Emacs 29.1.
|
|
(defalias 'tramp-compat-auth-info-password
|
|
(if (fboundp 'auth-info-password)
|
|
#'auth-info-password
|
|
(lambda (auth-info)
|
|
(let ((secret (plist-get auth-info :secret)))
|
|
(while (functionp secret)
|
|
(setq secret (funcall secret)))
|
|
secret))))
|
|
|
|
;; Function `take' is new in Emacs 29.1.
|
|
(defalias 'tramp-compat-take
|
|
(if (fboundp 'take)
|
|
#'take
|
|
(lambda (n list)
|
|
(when (and (natnump n) (> n 0))
|
|
(if (tramp-compat-length< list n)
|
|
list (butlast list (- (length list) n)))))))
|
|
|
|
;; Function `ntake' is new in Emacs 29.1.
|
|
(defalias 'tramp-compat-ntake
|
|
(if (fboundp 'ntake)
|
|
#'ntake
|
|
(lambda (n list)
|
|
(when (and (natnump n) (> n 0))
|
|
(if (tramp-compat-length< list n)
|
|
list (nbutlast list (- (length list) n)))))))
|
|
|
|
;; Function `string-equal-ignore-case' is new in Emacs 29.1.
|
|
(defalias 'tramp-compat-string-equal-ignore-case
|
|
(if (fboundp 'string-equal-ignore-case)
|
|
#'string-equal-ignore-case
|
|
(lambda (string1 string2)
|
|
(eq t (compare-strings string1 nil nil string2 nil nil t)))))
|
|
|
|
;; Function `auth-source-netrc-parse-all' is new in Emacs 29.1.
|
|
;; `netrc-parse' has been obsoleted in parallel.
|
|
(defalias 'tramp-compat-auth-source-netrc-parse-all
|
|
(if (fboundp 'auth-source-netrc-parse-all)
|
|
#'auth-source-netrc-parse-all
|
|
(lambda (&optional file)
|
|
(declare-function netrc-parse "netrc")
|
|
(autoload 'netrc-parse "netrc")
|
|
(netrc-parse file))))
|
|
|
|
(dolist (elt (all-completions "tramp-compat-" obarray 'functionp))
|
|
(put (intern elt) 'tramp-suppress-trace t))
|
|
|
|
(add-hook 'tramp-unload-hook
|
|
(lambda ()
|
|
(unload-feature 'tramp-loaddefs 'force)
|
|
(unload-feature 'tramp-compat 'force)))
|
|
|
|
(provide 'tramp-compat)
|
|
|
|
;;; TODO:
|
|
;;
|
|
;; * Starting with Emacs 27.1, there's no need to escape open
|
|
;; parentheses with a backslash in docstrings anymore.
|
|
;;
|
|
;; * Starting with Emacs 27.1, there's `make-empty-file'. Could be
|
|
;; used instead of `(write-region "" ...)'.
|
|
|
|
;;; tramp-compat.el ends here
|