Commit 5444cb5f authored by Michael Albinus's avatar Michael Albinus
Browse files

Fix Bug#31558

* lisp/net/tramp.el (tramp-mode, tramp-verbose)
(tramp-backup-directory-alist, tramp-auto-save-directory)
(tramp-encoding-shell, tramp-encoding-command-switch)
(tramp-encoding-command-interactive, tramp-default-method)
(tramp-default-method-alist, tramp-default-user)
(tramp-default-user-alist, tramp-default-host)
(tramp-default-host-alist, tramp-default-proxies-alist)
(tramp-save-ad-hoc-proxies, tramp-restricted-shell-hosts-alist)
(tramp-local-host-regexp, tramp-local-end-of-line)
(tramp-rsh-end-of-line, tramp-login-prompt-regexp)
(tramp-shell-prompt-pattern, tramp-password-prompt-regexp)
(tramp-wrong-passwd-regexp, tramp-yesno-prompt-regexp)
(tramp-yn-prompt-regexp, tramp-terminal-prompt-regexp)
(tramp-operation-not-permitted-regexp, tramp-copy-failed-regexp)
(tramp-process-alive-regexp, tramp-ignored-file-name-regexp)
(tramp-chunksize, tramp-process-connection-type)
(tramp-connection-timeout, tramp-connection-min-time-diff)
(tramp-completion-reread-directory-timeout)
* lisp/net/tramp-adb.el (tramp-adb-program)
(tramp-adb-connect-if-not-connected, tramp-adb-prompt):
* lisp/net/tramp-cache.el (tramp-connection-properties)
(tramp-persistency-file-name):
* lisp/net/tramp-gvfs.el (tramp-gvfs-methods)
(tramp-gvfs-zeroconf-domain)
(tramp-bluez-discover-devices-timeout):
* lisp/net/tramp-sh.el (tramp-inline-compress-start-size)
(tramp-copy-size-limit, tramp-terminal-type)
(tramp-histfile-override, tramp-use-ssh-controlmaster-options)
(tramp-remote-path, tramp-remote-process-environment)
(tramp-sh-extra-args):
* lisp/net/tramp-smb.el (tramp-smb-program, tramp-smb-acl-program)
(tramp-smb-conf, tramp-smb-winexe-program)
(tramp-smb-winexe-shell-command)
(tramp-smb-winexe-shell-command-switch):
Dont't require 'tramp.  (Bug#31558)

* lisp/net/tramp.el (tramp-ignored-file-name-regexp): Use type regexp.
parent 6f037f42
...@@ -40,8 +40,7 @@ ...@@ -40,8 +40,7 @@
"Name of the Android Debug Bridge program." "Name of the Android Debug Bridge program."
:group 'tramp :group 'tramp
:version "24.4" :version "24.4"
:type 'string :type 'string)
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defcustom tramp-adb-connect-if-not-connected nil (defcustom tramp-adb-connect-if-not-connected nil
...@@ -49,8 +48,7 @@ ...@@ -49,8 +48,7 @@
It is used for TCP/IP devices." It is used for TCP/IP devices."
:group 'tramp :group 'tramp
:version "25.1" :version "25.1"
:type 'boolean :type 'boolean)
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defconst tramp-adb-method "adb" (defconst tramp-adb-method "adb"
...@@ -62,8 +60,7 @@ It is used for TCP/IP devices." ...@@ -62,8 +60,7 @@ It is used for TCP/IP devices."
"Regexp used as prompt in almquist shell." "Regexp used as prompt in almquist shell."
:type 'string :type 'string
:version "24.4" :version "24.4"
:group 'tramp :group 'tramp)
:require 'tramp)
(defconst tramp-adb-ls-date-regexp (defconst tramp-adb-ls-date-regexp
"[[:space:]][0-9]\\{4\\}-[0-9][0-9]-[0-9][0-9][[:space:]][0-9][0-9]:[0-9][0-9][[:space:]]" "[[:space:]][0-9]\\{4\\}-[0-9][0-9]-[0-9][0-9][[:space:]][0-9][0-9]:[0-9][0-9][[:space:]]"
......
...@@ -73,16 +73,14 @@ details see the info pages." ...@@ -73,16 +73,14 @@ details see the info pages."
:version "24.4" :version "24.4"
:type '(repeat (list (choice :tag "File Name regexp" regexp (const nil)) :type '(repeat (list (choice :tag "File Name regexp" regexp (const nil))
(choice :tag " Property" string) (choice :tag " Property" string)
(choice :tag " Value" sexp))) (choice :tag " Value" sexp))))
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defcustom tramp-persistency-file-name (defcustom tramp-persistency-file-name
(expand-file-name (locate-user-emacs-file "tramp")) (expand-file-name (locate-user-emacs-file "tramp"))
"File which keeps connection history for Tramp connections." "File which keeps connection history for Tramp connections."
:group 'tramp :group 'tramp
:type 'file :type 'file)
:require 'tramp)
(defvar tramp-cache-data-changed nil (defvar tramp-cache-data-changed nil
"Whether persistent cache data have been changed.") "Whether persistent cache data have been changed.")
......
...@@ -143,8 +143,7 @@ ...@@ -143,8 +143,7 @@
(const "owncloud") (const "owncloud")
(const "sftp") (const "sftp")
(const "smb") (const "smb")
(const "synce"))) (const "synce"))))
:require 'tramp)
(defconst tramp-goa-methods '("gdrive" "owncloud") (defconst tramp-goa-methods '("gdrive" "owncloud")
"List of methods which require registration at GNOME Online Accounts.") "List of methods which require registration at GNOME Online Accounts.")
...@@ -171,8 +170,7 @@ ...@@ -171,8 +170,7 @@
"Zeroconf domain to be used for discovering services, like host names." "Zeroconf domain to be used for discovering services, like host names."
:group 'tramp :group 'tramp
:version "23.2" :version "23.2"
:type 'string :type 'string)
:require 'tramp)
;; Add the methods to `tramp-methods', in order to allow minibuffer ;; Add the methods to `tramp-methods', in order to allow minibuffer
;; completion. ;; completion.
...@@ -569,8 +567,7 @@ completion, nil means to use always cached values for discovered ...@@ -569,8 +567,7 @@ completion, nil means to use always cached values for discovered
devices." devices."
:group 'tramp :group 'tramp
:version "23.2" :version "23.2"
:type '(choice (const nil) integer) :type '(choice (const nil) integer))
:require 'tramp)
(defvar tramp-bluez-discovery nil (defvar tramp-bluez-discovery nil
"Indicator for a running bluetooth device discovery. "Indicator for a running bluetooth device discovery.
......
...@@ -48,8 +48,7 @@ When inline transfer, compress transferred data of file ...@@ -48,8 +48,7 @@ When inline transfer, compress transferred data of file
whose size is this value or above (up to `tramp-copy-size-limit'). whose size is this value or above (up to `tramp-copy-size-limit').
If it is nil, no compression at all will be applied." If it is nil, no compression at all will be applied."
:group 'tramp :group 'tramp
:type '(choice (const nil) integer) :type '(choice (const nil) integer))
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defcustom tramp-copy-size-limit 10240 (defcustom tramp-copy-size-limit 10240
...@@ -57,8 +56,7 @@ If it is nil, no compression at all will be applied." ...@@ -57,8 +56,7 @@ If it is nil, no compression at all will be applied."
out-of-the-band copy. out-of-the-band copy.
If it is nil, out-of-the-band copy will be used without a check." If it is nil, out-of-the-band copy will be used without a check."
:group 'tramp :group 'tramp
:type '(choice (const nil) integer) :type '(choice (const nil) integer))
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defcustom tramp-terminal-type "dumb" (defcustom tramp-terminal-type "dumb"
...@@ -67,8 +65,7 @@ Because Tramp wants to parse the output of the remote shell, it is easily ...@@ -67,8 +65,7 @@ Because Tramp wants to parse the output of the remote shell, it is easily
confused by ANSI color escape sequences and suchlike. Often, shell init confused by ANSI color escape sequences and suchlike. Often, shell init
files conditionalize this setup based on the TERM environment variable." files conditionalize this setup based on the TERM environment variable."
:group 'tramp :group 'tramp
:type 'string :type 'string)
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defcustom tramp-histfile-override "~/.tramp_history" (defcustom tramp-histfile-override "~/.tramp_history"
...@@ -85,8 +82,7 @@ the default storage location, e.g. \"$HOME/.sh_history\"." ...@@ -85,8 +82,7 @@ the default storage location, e.g. \"$HOME/.sh_history\"."
:version "25.2" :version "25.2"
:type '(choice (const :tag "Do not override HISTFILE" nil) :type '(choice (const :tag "Do not override HISTFILE" nil)
(const :tag "Unset HISTFILE" t) (const :tag "Unset HISTFILE" t)
(string :tag "Redirect to a file")) (string :tag "Redirect to a file")))
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defconst tramp-display-escape-sequence-regexp "\e[[;0-9]+m" (defconst tramp-display-escape-sequence-regexp "\e[[;0-9]+m"
...@@ -120,8 +116,7 @@ detected as prompt when being sent on echoing hosts, therefore.") ...@@ -120,8 +116,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
"Whether to use `tramp-ssh-controlmaster-options'." "Whether to use `tramp-ssh-controlmaster-options'."
:group 'tramp :group 'tramp
:version "24.4" :version "24.4"
:type 'boolean :type 'boolean)
:require 'tramp)
(defvar tramp-ssh-controlmaster-options nil (defvar tramp-ssh-controlmaster-options nil
"Which ssh Control* arguments to use. "Which ssh Control* arguments to use.
...@@ -528,8 +523,7 @@ the list by the special value `tramp-own-remote-path'." ...@@ -528,8 +523,7 @@ the list by the special value `tramp-own-remote-path'."
:type '(repeat (choice :type '(repeat (choice
(const :tag "Default Directories" tramp-default-remote-path) (const :tag "Default Directories" tramp-default-remote-path)
(const :tag "Private Directories" tramp-own-remote-path) (const :tag "Private Directories" tramp-own-remote-path)
(string :tag "Directory"))) (string :tag "Directory"))))
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defcustom tramp-remote-process-environment (defcustom tramp-remote-process-environment
...@@ -553,8 +547,7 @@ The INSIDE_EMACS environment variable will automatically be set ...@@ -553,8 +547,7 @@ The INSIDE_EMACS environment variable will automatically be set
based on the TRAMP and Emacs versions, and should not be set here." based on the TRAMP and Emacs versions, and should not be set here."
:group 'tramp :group 'tramp
:version "26.1" :version "26.1"
:type '(repeat string) :type '(repeat string))
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defcustom tramp-sh-extra-args '(("/bash\\'" . "-norc -noprofile")) (defcustom tramp-sh-extra-args '(("/bash\\'" . "-norc -noprofile"))
...@@ -567,8 +560,7 @@ This variable is only used when Tramp needs to start up another shell ...@@ -567,8 +560,7 @@ This variable is only used when Tramp needs to start up another shell
for tilde expansion. The extra arguments should typically prevent the for tilde expansion. The extra arguments should typically prevent the
shell from reading its init file." shell from reading its init file."
:group 'tramp :group 'tramp
:type '(alist :key-type regexp :value-type string) :type '(alist :key-type regexp :value-type string))
:require 'tramp)
(defconst tramp-actions-before-shell (defconst tramp-actions-before-shell
'((tramp-login-prompt-regexp tramp-action-login) '((tramp-login-prompt-regexp tramp-action-login)
......
...@@ -67,16 +67,14 @@ ...@@ -67,16 +67,14 @@
(defcustom tramp-smb-program "smbclient" (defcustom tramp-smb-program "smbclient"
"Name of SMB client to run." "Name of SMB client to run."
:group 'tramp :group 'tramp
:type 'string :type 'string)
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defcustom tramp-smb-acl-program "smbcacls" (defcustom tramp-smb-acl-program "smbcacls"
"Name of SMB acls to run." "Name of SMB acls to run."
:group 'tramp :group 'tramp
:type 'string :type 'string
:version "24.4" :version "24.4")
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defcustom tramp-smb-conf "/dev/null" (defcustom tramp-smb-conf "/dev/null"
...@@ -84,8 +82,7 @@ ...@@ -84,8 +82,7 @@
If it is nil, no smb.conf will be added to the `tramp-smb-program' If it is nil, no smb.conf will be added to the `tramp-smb-program'
call, letting the SMB client use the default one." call, letting the SMB client use the default one."
:group 'tramp :group 'tramp
:type '(choice (const nil) (file :must-match t)) :type '(choice (const nil) (file :must-match t)))
:require 'tramp)
(defvar tramp-smb-version nil (defvar tramp-smb-version nil
"Version string of the SMB client.") "Version string of the SMB client.")
...@@ -300,8 +297,7 @@ If it isn't found in the local $PATH, the absolute path of winexe ...@@ -300,8 +297,7 @@ If it isn't found in the local $PATH, the absolute path of winexe
shall be given. This is needed for remote processes." shall be given. This is needed for remote processes."
:group 'tramp :group 'tramp
:type 'string :type 'string
:version "24.3" :version "24.3")
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defcustom tramp-smb-winexe-shell-command "powershell.exe" (defcustom tramp-smb-winexe-shell-command "powershell.exe"
...@@ -309,8 +305,7 @@ shall be given. This is needed for remote processes." ...@@ -309,8 +305,7 @@ shall be given. This is needed for remote processes."
This must be Powershell V2 compatible." This must be Powershell V2 compatible."
:group 'tramp :group 'tramp
:type 'string :type 'string
:version "24.3" :version "24.3")
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defcustom tramp-smb-winexe-shell-command-switch "-file -" (defcustom tramp-smb-winexe-shell-command-switch "-file -"
...@@ -318,8 +313,7 @@ This must be Powershell V2 compatible." ...@@ -318,8 +313,7 @@ This must be Powershell V2 compatible."
This can be used to disable echo etc." This can be used to disable echo etc."
:group 'tramp :group 'tramp
:type 'string :type 'string
:version "24.3" :version "24.3")
:require 'tramp)
;; It must be a `defsubst' in order to push the whole code into ;; It must be a `defsubst' in order to push the whole code into
;; tramp-loaddefs.el. Otherwise, there would be recursive autoloading. ;; tramp-loaddefs.el. Otherwise, there would be recursive autoloading.
......
...@@ -80,8 +80,7 @@ ...@@ -80,8 +80,7 @@
"Whether Tramp is enabled. "Whether Tramp is enabled.
If it is set to nil, all remote file names are used literally." If it is set to nil, all remote file names are used literally."
:group 'tramp :group 'tramp
:type 'boolean :type 'boolean)
:require 'tramp)
(defcustom tramp-verbose 3 (defcustom tramp-verbose 3
"Verbosity level for Tramp messages. "Verbosity level for Tramp messages.
...@@ -99,8 +98,7 @@ Any level x includes messages for all levels 1 .. x-1. The levels are ...@@ -99,8 +98,7 @@ Any level x includes messages for all levels 1 .. x-1. The levels are
9 test commands 9 test commands
10 traces (huge)." 10 traces (huge)."
:group 'tramp :group 'tramp
:type 'integer :type 'integer)
:require 'tramp)
(defcustom tramp-backup-directory-alist nil (defcustom tramp-backup-directory-alist nil
"Alist of filename patterns and backup directory names. "Alist of filename patterns and backup directory names.
...@@ -115,8 +113,7 @@ gives the same backup policy for Tramp files on their hosts like the ...@@ -115,8 +113,7 @@ gives the same backup policy for Tramp files on their hosts like the
policy for local files." policy for local files."
:group 'tramp :group 'tramp
:type '(repeat (cons (regexp :tag "Regexp matching filename") :type '(repeat (cons (regexp :tag "Regexp matching filename")
(directory :tag "Backup directory name"))) (directory :tag "Backup directory name"))))
:require 'tramp)
(defcustom tramp-auto-save-directory nil (defcustom tramp-auto-save-directory nil
"Put auto-save files in this directory, if set. "Put auto-save files in this directory, if set.
...@@ -124,8 +121,7 @@ The idea is to use a local directory so that auto-saving is faster. ...@@ -124,8 +121,7 @@ The idea is to use a local directory so that auto-saving is faster.
This setting has precedence over `auto-save-file-name-transforms'." This setting has precedence over `auto-save-file-name-transforms'."
:group 'tramp :group 'tramp
:type '(choice (const :tag "Use default" nil) :type '(choice (const :tag "Use default" nil)
(directory :tag "Auto save directory name")) (directory :tag "Auto save directory name")))
:require 'tramp)
(defcustom tramp-encoding-shell (defcustom tramp-encoding-shell
(or (tramp-compat-funcall 'w32-shell-name) "/bin/sh") (or (tramp-compat-funcall 'w32-shell-name) "/bin/sh")
...@@ -149,16 +145,14 @@ Note that this variable is not used for remote commands. There are ...@@ -149,16 +145,14 @@ Note that this variable is not used for remote commands. There are
mechanisms in tramp.el which automatically determine the right shell to mechanisms in tramp.el which automatically determine the right shell to
use for the remote host." use for the remote host."
:group 'tramp :group 'tramp
:type '(file :must-match t) :type '(file :must-match t))
:require 'tramp)
(defcustom tramp-encoding-command-switch (defcustom tramp-encoding-command-switch
(if (tramp-compat-funcall 'w32-shell-dos-semantics) "/c" "-c") (if (tramp-compat-funcall 'w32-shell-dos-semantics) "/c" "-c")
"Use this switch together with `tramp-encoding-shell' for local commands. "Use this switch together with `tramp-encoding-shell' for local commands.
See the variable `tramp-encoding-shell' for more information." See the variable `tramp-encoding-shell' for more information."
:group 'tramp :group 'tramp
:type 'string :type 'string)
:require 'tramp)
(defcustom tramp-encoding-command-interactive (defcustom tramp-encoding-command-interactive
(unless (tramp-compat-funcall 'w32-shell-dos-semantics) "-i") (unless (tramp-compat-funcall 'w32-shell-dos-semantics) "-i")
...@@ -166,8 +160,7 @@ See the variable `tramp-encoding-shell' for more information." ...@@ -166,8 +160,7 @@ See the variable `tramp-encoding-shell' for more information."
See the variable `tramp-encoding-shell' for more information." See the variable `tramp-encoding-shell' for more information."
:version "24.1" :version "24.1"
:group 'tramp :group 'tramp
:type '(choice (const nil) string) :type '(choice (const nil) string))
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defvar tramp-methods nil (defvar tramp-methods nil
...@@ -310,8 +303,7 @@ useful only in combination with `tramp-default-proxies-alist'.") ...@@ -310,8 +303,7 @@ useful only in combination with `tramp-default-proxies-alist'.")
See `tramp-methods' for possibilities. See `tramp-methods' for possibilities.
Also see `tramp-default-method-alist'." Also see `tramp-default-method-alist'."
:group 'tramp :group 'tramp
:type 'string :type 'string)
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defcustom tramp-default-method-alist nil (defcustom tramp-default-method-alist nil
...@@ -329,8 +321,7 @@ See `tramp-methods' for a list of possibilities for METHOD." ...@@ -329,8 +321,7 @@ See `tramp-methods' for a list of possibilities for METHOD."
:group 'tramp :group 'tramp
:type '(repeat (list (choice :tag "Host regexp" regexp sexp) :type '(repeat (list (choice :tag "Host regexp" regexp sexp)
(choice :tag "User regexp" regexp sexp) (choice :tag "User regexp" regexp sexp)
(choice :tag "Method name" string (const nil)))) (choice :tag "Method name" string (const nil)))))
:require 'tramp)
(defconst tramp-default-method-marker "-" (defconst tramp-default-method-marker "-"
"Marker for default method in remote file names.") "Marker for default method in remote file names.")
...@@ -342,8 +333,7 @@ It is nil by default; otherwise settings in configuration files like ...@@ -342,8 +333,7 @@ It is nil by default; otherwise settings in configuration files like
This variable is regarded as obsolete, and will be removed soon." This variable is regarded as obsolete, and will be removed soon."
:group 'tramp :group 'tramp
:type '(choice (const nil) string) :type '(choice (const nil) string))
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defcustom tramp-default-user-alist nil (defcustom tramp-default-user-alist nil
...@@ -359,15 +349,13 @@ empty string for the method name." ...@@ -359,15 +349,13 @@ empty string for the method name."
:group 'tramp :group 'tramp
:type '(repeat (list (choice :tag "Method regexp" regexp sexp) :type '(repeat (list (choice :tag "Method regexp" regexp sexp)
(choice :tag " Host regexp" regexp sexp) (choice :tag " Host regexp" regexp sexp)
(choice :tag " User name" string (const nil)))) (choice :tag " User name" string (const nil)))))
:require 'tramp)
(defcustom tramp-default-host (system-name) (defcustom tramp-default-host (system-name)
"Default host to use for transferring files. "Default host to use for transferring files.
Useful for su and sudo methods mostly." Useful for su and sudo methods mostly."
:group 'tramp :group 'tramp
:type 'string :type 'string)
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defcustom tramp-default-host-alist nil (defcustom tramp-default-host-alist nil
...@@ -384,8 +372,7 @@ empty string for the method name." ...@@ -384,8 +372,7 @@ empty string for the method name."
:version "24.4" :version "24.4"
:type '(repeat (list (choice :tag "Method regexp" regexp sexp) :type '(repeat (list (choice :tag "Method regexp" regexp sexp)
(choice :tag " User regexp" regexp sexp) (choice :tag " User regexp" regexp sexp)
(choice :tag " Host name" string (const nil)))) (choice :tag " Host name" string (const nil)))))
:require 'tramp)
(defcustom tramp-default-proxies-alist nil (defcustom tramp-default-proxies-alist nil
"Route to be followed for specific host/user pairs. "Route to be followed for specific host/user pairs.
...@@ -404,15 +391,13 @@ interpreted as a regular expression which always matches." ...@@ -404,15 +391,13 @@ interpreted as a regular expression which always matches."
:group 'tramp :group 'tramp
:type '(repeat (list (choice :tag "Host regexp" regexp sexp) :type '(repeat (list (choice :tag "Host regexp" regexp sexp)
(choice :tag "User regexp" regexp sexp) (choice :tag "User regexp" regexp sexp)
(choice :tag " Proxy name" string (const nil)))) (choice :tag " Proxy name" string (const nil)))))
:require 'tramp)
(defcustom tramp-save-ad-hoc-proxies nil (defcustom tramp-save-ad-hoc-proxies nil
"Whether to save ad-hoc proxies persistently." "Whether to save ad-hoc proxies persistently."
:group 'tramp :group 'tramp
:version "24.3" :version "24.3"
:type 'boolean :type 'boolean)
:require 'tramp)
(defcustom tramp-restricted-shell-hosts-alist (defcustom tramp-restricted-shell-hosts-alist
(when (memq system-type '(windows-nt)) (when (memq system-type '(windows-nt))
...@@ -424,8 +409,7 @@ proxies only, see `tramp-default-proxies-alist'. If the local ...@@ -424,8 +409,7 @@ proxies only, see `tramp-default-proxies-alist'. If the local
host runs a registered shell, it shall be added to this list, too." host runs a registered shell, it shall be added to this list, too."
:version "24.3" :version "24.3"
:group 'tramp :group 'tramp
:type '(repeat (regexp :tag "Host regexp")) :type '(repeat (regexp :tag "Host regexp")))
:require 'tramp)
;;;###tramp-autoload ;;;###tramp-autoload
(defcustom tramp-local-host-regexp (defcustom tramp-local-host-regexp
...@@ -439,8 +423,7 @@ If the local host runs a chrooted environment, set this to nil." ...@@ -439,8 +423,7 @@ If the local host runs a chrooted environment, set this to nil."
:version "27.1" :version "27.1"
:group 'tramp :group 'tramp
:type '(choice (const :tag "Chrooted environment" nil) :type '(choice (const :tag "Chrooted environment" nil)
(regexp :tag "Host regexp")) (regexp :tag "Host regexp")))
:require 'tramp)
(defvar tramp-completion-function-alist nil (defvar tramp-completion-function-alist nil
"Alist of methods for remote files. "Alist of methods for remote files.
...@@ -492,16 +475,14 @@ the remote shell.") ...@@ -492,16 +475,14 @@ the remote shell.")
"String used for end of line in local processes." "String used for end of line in local processes."
:version "24.1" :version "24.1"
:group 'tramp :group 'tramp
:type 'string :type 'string)
:require 'tramp)
(defcustom tramp-rsh-end-of-line "\n" (defcustom tramp-rsh-end-of-line "\n"
"String used for end of line in rsh connections. "String used for end of line in rsh connections.
I don't think this ever needs to be changed, so please tell me about it I don't think this ever needs to be changed, so please tell me about it
if you need to change this." if you need to change this."
:group 'tramp :group 'tramp
:type 'string :type 'string)
:require 'tramp)
(defcustom tramp-login-prompt-regexp (defcustom tramp-login-prompt-regexp
".*\\(user\\|login\\)\\( .*\\)?: *" ".*\\(user\\|login\\)\\( .*\\)?: *"
...@@ -510,8 +491,7 @@ The regexp should match at end of buffer. ...@@ -510,8 +491,7 @@ The regexp should match at end of buffer.
Sometimes the prompt is reported to look like \"login as:\"." Sometimes the prompt is reported to look like \"login as:\"."
:group 'tramp :group 'tramp
:type 'regexp :type 'regexp)
:require 'tramp)
(defcustom tramp-shell-prompt-pattern (defcustom tramp-shell-prompt-pattern
;; Allow a prompt to start right after a ^M since it indeed would be ;; Allow a prompt to start right after a ^M since it indeed would be
...@@ -533,8 +513,7 @@ which should work well in many cases. ...@@ -533,8 +513,7 @@ which should work well in many cases.
This regexp must match both `tramp-initial-end-of-output' and This regexp must match both `tramp-initial-end-of-output' and
`tramp-end-of-output'." `tramp-end-of-output'."
:group 'tramp :group 'tramp
:type 'regexp :type 'regexp)
:require 'tramp)
(defcustom tramp-password-prompt-regexp (defcustom tramp-password-prompt-regexp
(format "^.*\\(%s\\).*:\^@? *" (format "^.*\\(%s\\).*:\^@? *"
...@@ -547,8 +526,7 @@ The regexp should match at end of buffer. ...@@ -547,8 +526,7 @@ The regexp should match at end of buffer.
The `sudo' program appears to insert a `^@' character into the prompt." The `sudo' program appears to insert a `^@' character into the prompt."
:version "24.4" :version "24.4"
:group 'tramp :group 'tramp
:type 'regexp :type 'regexp)
:require 'tramp)
(defcustom tramp-wrong-passwd-regexp (defcustom tramp-wrong-passwd-regexp
(concat "^.*" (concat "^.*"
...@@ -573,8 +551,7 @@ The `sudo' program appears to insert a `^@' character into the prompt." ...@@ -573,8 +551,7 @@ The `sudo' program appears to insert a `^@' character into the prompt."
"Regexp matching a `login failed' message. "Regexp matching a `login failed' message.
The regexp should match at end of buffer." The regexp should match at end of buffer."
:group 'tramp :group 'tramp
:type 'regexp :type 'regexp)
:require 'tramp)
(defcustom tramp-yesno-prompt-regexp (defcustom tramp-yesno-prompt-regexp
(concat (concat
...@@ -585,8 +562,7 @@ The confirmation should be done with yes or no. ...@@ -585,8 +562,7 @@ The confirmation should be done with yes or no.