Commit 710e79a6 authored by Michael Albinus's avatar Michael Albinus
Browse files

Fix Bug#33781

* lisp/net/tramp-cache.el (tramp-connection-properties):
* lisp/net/tramp-sh.el (tramp-remote-path)
(tramp-remote-process-environment, tramp-sh-extra-args):
Reinsert autoload cookie.  (Bug#33781)

* test/lisp/net/tramp-tests.el: Do not require tramp-sh before
changing tramp-remote-path.
parent 5a9eba60
Pipeline #315 failed with stage
in 2 seconds
......@@ -72,6 +72,7 @@
(defvar tramp-cache-data (make-hash-table :test 'equal)
"Hash table for remote files properties.")
;;;###tramp-autoload
(defcustom tramp-connection-properties nil
"List of static connection properties.
Every entry has the form (REGEXP PROPERTY VALUE). The regexp
......
......@@ -466,6 +466,7 @@ The string is used in `tramp-methods'.")
;; Darwin: /usr/bin:/bin:/usr/sbin:/sbin
;; IRIX64: /usr/bin
;; QNAP QTS: ---
;;;###tramp-autoload
(defcustom tramp-remote-path
'(tramp-default-remote-path "/bin" "/usr/bin" "/sbin" "/usr/sbin"
"/usr/local/bin" "/usr/local/sbin" "/local/bin" "/local/freeware/bin"
......@@ -495,6 +496,7 @@ the list by the special value `tramp-own-remote-path'."
(const :tag "Private Directories" tramp-own-remote-path)
(string :tag "Directory"))))
;;;###tramp-autoload
(defcustom tramp-remote-process-environment
'("ENV=''" "TMOUT=0" "LC_CTYPE=''"
"CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=cat"
......@@ -518,6 +520,7 @@ based on the Tramp and Emacs versions, and should not be set here."
:version "26.1"
:type '(repeat string))
;;;###tramp-autoload
(defcustom tramp-sh-extra-args '(("/bash\\'" . "-norc -noprofile"))
"Alist specifying extra arguments to pass to the remote shell.
Entries are (REGEXP . ARGS) where REGEXP is a regular expression
......
......@@ -107,7 +107,6 @@
;; This should happen on hydra only.
(when (getenv "EMACS_HYDRA_CI")
(require 'tramp-sh)
(add-to-list 'tramp-remote-path 'tramp-own-remote-path))
(defvar tramp--test-enabled-checked nil
......
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