aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2018-05-24 14:32:12 +0200
committerMichael Albinus2018-05-24 14:32:12 +0200
commit5444cb5f6867d43d1c21f30949e2002d8450cbc2 (patch)
tree692efbefda0b1c40be944fe273a5d1c3bcffd8c9
parent6f037f427a25160168e842bff0d12b816d69067d (diff)
downloademacs-5444cb5f6867d43d1c21f30949e2002d8450cbc2.tar.gz
emacs-5444cb5f6867d43d1c21f30949e2002d8450cbc2.zip
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.
-rw-r--r--lisp/net/tramp-adb.el9
-rw-r--r--lisp/net/tramp-cache.el6
-rw-r--r--lisp/net/tramp-gvfs.el9
-rw-r--r--lisp/net/tramp-sh.el24
-rw-r--r--lisp/net/tramp-smb.el18
-rw-r--r--lisp/net/tramp.el105
6 files changed, 57 insertions, 114 deletions
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index f8edb27c516..df2160770b1 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -40,8 +40,7 @@
40 "Name of the Android Debug Bridge program." 40 "Name of the Android Debug Bridge program."
41 :group 'tramp 41 :group 'tramp
42 :version "24.4" 42 :version "24.4"
43 :type 'string 43 :type 'string)
44 :require 'tramp)
45 44
46;;;###tramp-autoload 45;;;###tramp-autoload
47(defcustom tramp-adb-connect-if-not-connected nil 46(defcustom tramp-adb-connect-if-not-connected nil
@@ -49,8 +48,7 @@
49It is used for TCP/IP devices." 48It is used for TCP/IP devices."
50 :group 'tramp 49 :group 'tramp
51 :version "25.1" 50 :version "25.1"
52 :type 'boolean 51 :type 'boolean)
53 :require 'tramp)
54 52
55;;;###tramp-autoload 53;;;###tramp-autoload
56(defconst tramp-adb-method "adb" 54(defconst tramp-adb-method "adb"
@@ -62,8 +60,7 @@ It is used for TCP/IP devices."
62 "Regexp used as prompt in almquist shell." 60 "Regexp used as prompt in almquist shell."
63 :type 'string 61 :type 'string
64 :version "24.4" 62 :version "24.4"
65 :group 'tramp 63 :group 'tramp)
66 :require 'tramp)
67 64
68(defconst tramp-adb-ls-date-regexp 65(defconst tramp-adb-ls-date-regexp
69 "[[:space:]][0-9]\\{4\\}-[0-9][0-9]-[0-9][0-9][[:space:]][0-9][0-9]:[0-9][0-9][[:space:]]" 66 "[[:space:]][0-9]\\{4\\}-[0-9][0-9]-[0-9][0-9][[:space:]][0-9][0-9]:[0-9][0-9][[:space:]]"
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index 97c687598f2..b40a4d7edd6 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -73,16 +73,14 @@ details see the info pages."
73 :version "24.4" 73 :version "24.4"
74 :type '(repeat (list (choice :tag "File Name regexp" regexp (const nil)) 74 :type '(repeat (list (choice :tag "File Name regexp" regexp (const nil))
75 (choice :tag " Property" string) 75 (choice :tag " Property" string)
76 (choice :tag " Value" sexp))) 76 (choice :tag " Value" sexp))))
77 :require 'tramp)
78 77
79;;;###tramp-autoload 78;;;###tramp-autoload
80(defcustom tramp-persistency-file-name 79(defcustom tramp-persistency-file-name
81 (expand-file-name (locate-user-emacs-file "tramp")) 80 (expand-file-name (locate-user-emacs-file "tramp"))
82 "File which keeps connection history for Tramp connections." 81 "File which keeps connection history for Tramp connections."
83 :group 'tramp 82 :group 'tramp
84 :type 'file 83 :type 'file)
85 :require 'tramp)
86 84
87(defvar tramp-cache-data-changed nil 85(defvar tramp-cache-data-changed nil
88 "Whether persistent cache data have been changed.") 86 "Whether persistent cache data have been changed.")
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index a9a1a6085a4..ac250818aca 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -143,8 +143,7 @@
143 (const "owncloud") 143 (const "owncloud")
144 (const "sftp") 144 (const "sftp")
145 (const "smb") 145 (const "smb")
146 (const "synce"))) 146 (const "synce"))))
147 :require 'tramp)
148 147
149(defconst tramp-goa-methods '("gdrive" "owncloud") 148(defconst tramp-goa-methods '("gdrive" "owncloud")
150 "List of methods which require registration at GNOME Online Accounts.") 149 "List of methods which require registration at GNOME Online Accounts.")
@@ -171,8 +170,7 @@
171 "Zeroconf domain to be used for discovering services, like host names." 170 "Zeroconf domain to be used for discovering services, like host names."
172 :group 'tramp 171 :group 'tramp
173 :version "23.2" 172 :version "23.2"
174 :type 'string 173 :type 'string)
175 :require 'tramp)
176 174
177;; Add the methods to `tramp-methods', in order to allow minibuffer 175;; Add the methods to `tramp-methods', in order to allow minibuffer
178;; completion. 176;; completion.
@@ -569,8 +567,7 @@ completion, nil means to use always cached values for discovered
569devices." 567devices."
570 :group 'tramp 568 :group 'tramp
571 :version "23.2" 569 :version "23.2"
572 :type '(choice (const nil) integer) 570 :type '(choice (const nil) integer))
573 :require 'tramp)
574 571
575(defvar tramp-bluez-discovery nil 572(defvar tramp-bluez-discovery nil
576 "Indicator for a running bluetooth device discovery. 573 "Indicator for a running bluetooth device discovery.
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 9ea23a4edb5..227fd9c356d 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -48,8 +48,7 @@ When inline transfer, compress transferred data of file
48whose size is this value or above (up to `tramp-copy-size-limit'). 48whose size is this value or above (up to `tramp-copy-size-limit').
49If it is nil, no compression at all will be applied." 49If it is nil, no compression at all will be applied."
50 :group 'tramp 50 :group 'tramp
51 :type '(choice (const nil) integer) 51 :type '(choice (const nil) integer))
52 :require 'tramp)
53 52
54;;;###tramp-autoload 53;;;###tramp-autoload
55(defcustom tramp-copy-size-limit 10240 54(defcustom tramp-copy-size-limit 10240
@@ -57,8 +56,7 @@ If it is nil, no compression at all will be applied."
57out-of-the-band copy. 56out-of-the-band copy.
58If it is nil, out-of-the-band copy will be used without a check." 57If it is nil, out-of-the-band copy will be used without a check."
59 :group 'tramp 58 :group 'tramp
60 :type '(choice (const nil) integer) 59 :type '(choice (const nil) integer))
61 :require 'tramp)
62 60
63;;;###tramp-autoload 61;;;###tramp-autoload
64(defcustom tramp-terminal-type "dumb" 62(defcustom tramp-terminal-type "dumb"
@@ -67,8 +65,7 @@ Because Tramp wants to parse the output of the remote shell, it is easily
67confused by ANSI color escape sequences and suchlike. Often, shell init 65confused by ANSI color escape sequences and suchlike. Often, shell init
68files conditionalize this setup based on the TERM environment variable." 66files conditionalize this setup based on the TERM environment variable."
69 :group 'tramp 67 :group 'tramp
70 :type 'string 68 :type 'string)
71 :require 'tramp)
72 69
73;;;###tramp-autoload 70;;;###tramp-autoload
74(defcustom tramp-histfile-override "~/.tramp_history" 71(defcustom tramp-histfile-override "~/.tramp_history"
@@ -85,8 +82,7 @@ the default storage location, e.g. \"$HOME/.sh_history\"."
85 :version "25.2" 82 :version "25.2"
86 :type '(choice (const :tag "Do not override HISTFILE" nil) 83 :type '(choice (const :tag "Do not override HISTFILE" nil)
87 (const :tag "Unset HISTFILE" t) 84 (const :tag "Unset HISTFILE" t)
88 (string :tag "Redirect to a file")) 85 (string :tag "Redirect to a file")))
89 :require 'tramp)
90 86
91;;;###tramp-autoload 87;;;###tramp-autoload
92(defconst tramp-display-escape-sequence-regexp "\e[[;0-9]+m" 88(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 "Whether to use `tramp-ssh-controlmaster-options'." 116 "Whether to use `tramp-ssh-controlmaster-options'."
121 :group 'tramp 117 :group 'tramp
122 :version "24.4" 118 :version "24.4"
123 :type 'boolean 119 :type 'boolean)
124 :require 'tramp)
125 120
126(defvar tramp-ssh-controlmaster-options nil 121(defvar tramp-ssh-controlmaster-options nil
127 "Which ssh Control* arguments to use. 122 "Which ssh Control* arguments to use.
@@ -528,8 +523,7 @@ the list by the special value `tramp-own-remote-path'."
528 :type '(repeat (choice 523 :type '(repeat (choice
529 (const :tag "Default Directories" tramp-default-remote-path) 524 (const :tag "Default Directories" tramp-default-remote-path)
530 (const :tag "Private Directories" tramp-own-remote-path) 525 (const :tag "Private Directories" tramp-own-remote-path)
531 (string :tag "Directory"))) 526 (string :tag "Directory"))))
532 :require 'tramp)
533 527
534;;;###tramp-autoload 528;;;###tramp-autoload
535(defcustom tramp-remote-process-environment 529(defcustom tramp-remote-process-environment
@@ -553,8 +547,7 @@ The INSIDE_EMACS environment variable will automatically be set
553based on the TRAMP and Emacs versions, and should not be set here." 547based on the TRAMP and Emacs versions, and should not be set here."
554 :group 'tramp 548 :group 'tramp
555 :version "26.1" 549 :version "26.1"
556 :type '(repeat string) 550 :type '(repeat string))
557 :require 'tramp)
558 551
559;;;###tramp-autoload 552;;;###tramp-autoload
560(defcustom tramp-sh-extra-args '(("/bash\\'" . "-norc -noprofile")) 553(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
567for tilde expansion. The extra arguments should typically prevent the 560for tilde expansion. The extra arguments should typically prevent the
568shell from reading its init file." 561shell from reading its init file."
569 :group 'tramp 562 :group 'tramp
570 :type '(alist :key-type regexp :value-type string) 563 :type '(alist :key-type regexp :value-type string))
571 :require 'tramp)
572 564
573(defconst tramp-actions-before-shell 565(defconst tramp-actions-before-shell
574 '((tramp-login-prompt-regexp tramp-action-login) 566 '((tramp-login-prompt-regexp tramp-action-login)
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index a4d0d53bf70..c2df2e21bcb 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -67,16 +67,14 @@
67(defcustom tramp-smb-program "smbclient" 67(defcustom tramp-smb-program "smbclient"
68 "Name of SMB client to run." 68 "Name of SMB client to run."
69 :group 'tramp 69 :group 'tramp
70 :type 'string 70 :type 'string)
71 :require 'tramp)
72 71
73;;;###tramp-autoload 72;;;###tramp-autoload
74(defcustom tramp-smb-acl-program "smbcacls" 73(defcustom tramp-smb-acl-program "smbcacls"
75 "Name of SMB acls to run." 74 "Name of SMB acls to run."
76 :group 'tramp 75 :group 'tramp
77 :type 'string 76 :type 'string
78 :version "24.4" 77 :version "24.4")
79 :require 'tramp)
80 78
81;;;###tramp-autoload 79;;;###tramp-autoload
82(defcustom tramp-smb-conf "/dev/null" 80(defcustom tramp-smb-conf "/dev/null"
@@ -84,8 +82,7 @@
84If it is nil, no smb.conf will be added to the `tramp-smb-program' 82If it is nil, no smb.conf will be added to the `tramp-smb-program'
85call, letting the SMB client use the default one." 83call, letting the SMB client use the default one."
86 :group 'tramp 84 :group 'tramp
87 :type '(choice (const nil) (file :must-match t)) 85 :type '(choice (const nil) (file :must-match t)))
88 :require 'tramp)
89 86
90(defvar tramp-smb-version nil 87(defvar tramp-smb-version nil
91 "Version string of the SMB client.") 88 "Version string of the SMB client.")
@@ -300,8 +297,7 @@ If it isn't found in the local $PATH, the absolute path of winexe
300shall be given. This is needed for remote processes." 297shall be given. This is needed for remote processes."
301 :group 'tramp 298 :group 'tramp
302 :type 'string 299 :type 'string
303 :version "24.3" 300 :version "24.3")
304 :require 'tramp)
305 301
306;;;###tramp-autoload 302;;;###tramp-autoload
307(defcustom tramp-smb-winexe-shell-command "powershell.exe" 303(defcustom tramp-smb-winexe-shell-command "powershell.exe"
@@ -309,8 +305,7 @@ shall be given. This is needed for remote processes."
309This must be Powershell V2 compatible." 305This must be Powershell V2 compatible."
310 :group 'tramp 306 :group 'tramp
311 :type 'string 307 :type 'string
312 :version "24.3" 308 :version "24.3")
313 :require 'tramp)
314 309
315;;;###tramp-autoload 310;;;###tramp-autoload
316(defcustom tramp-smb-winexe-shell-command-switch "-file -" 311(defcustom tramp-smb-winexe-shell-command-switch "-file -"
@@ -318,8 +313,7 @@ This must be Powershell V2 compatible."
318This can be used to disable echo etc." 313This can be used to disable echo etc."
319 :group 'tramp 314 :group 'tramp
320 :type 'string 315 :type 'string
321 :version "24.3" 316 :version "24.3")
322 :require 'tramp)
323 317
324;; It must be a `defsubst' in order to push the whole code into 318;; It must be a `defsubst' in order to push the whole code into
325;; tramp-loaddefs.el. Otherwise, there would be recursive autoloading. 319;; tramp-loaddefs.el. Otherwise, there would be recursive autoloading.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 499fcadffff..cc3130e2122 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -80,8 +80,7 @@
80 "Whether Tramp is enabled. 80 "Whether Tramp is enabled.
81If it is set to nil, all remote file names are used literally." 81If it is set to nil, all remote file names are used literally."
82 :group 'tramp 82 :group 'tramp
83 :type 'boolean 83 :type 'boolean)
84 :require 'tramp)
85 84
86(defcustom tramp-verbose 3 85(defcustom tramp-verbose 3
87 "Verbosity level for Tramp messages. 86 "Verbosity level for Tramp messages.
@@ -99,8 +98,7 @@ Any level x includes messages for all levels 1 .. x-1. The levels are
99 9 test commands 98 9 test commands
10010 traces (huge)." 9910 traces (huge)."
101 :group 'tramp 100 :group 'tramp
102 :type 'integer 101 :type 'integer)
103 :require 'tramp)
104 102
105(defcustom tramp-backup-directory-alist nil 103(defcustom tramp-backup-directory-alist nil
106 "Alist of filename patterns and backup directory names. 104 "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
115policy for local files." 113policy for local files."
116 :group 'tramp 114 :group 'tramp
117 :type '(repeat (cons (regexp :tag "Regexp matching filename") 115 :type '(repeat (cons (regexp :tag "Regexp matching filename")
118 (directory :tag "Backup directory name"))) 116 (directory :tag "Backup directory name"))))
119 :require 'tramp)
120 117
121(defcustom tramp-auto-save-directory nil 118(defcustom tramp-auto-save-directory nil
122 "Put auto-save files in this directory, if set. 119 "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.
124This setting has precedence over `auto-save-file-name-transforms'." 121This setting has precedence over `auto-save-file-name-transforms'."
125 :group 'tramp 122 :group 'tramp
126 :type '(choice (const :tag "Use default" nil) 123 :type '(choice (const :tag "Use default" nil)
127 (directory :tag "Auto save directory name")) 124 (directory :tag "Auto save directory name")))
128 :require 'tramp)
129 125
130(defcustom tramp-encoding-shell 126(defcustom tramp-encoding-shell
131 (or (tramp-compat-funcall 'w32-shell-name) "/bin/sh") 127 (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
149mechanisms in tramp.el which automatically determine the right shell to 145mechanisms in tramp.el which automatically determine the right shell to
150use for the remote host." 146use for the remote host."
151 :group 'tramp 147 :group 'tramp
152 :type '(file :must-match t) 148 :type '(file :must-match t))
153 :require 'tramp)
154 149
155(defcustom tramp-encoding-command-switch 150(defcustom tramp-encoding-command-switch
156 (if (tramp-compat-funcall 'w32-shell-dos-semantics) "/c" "-c") 151 (if (tramp-compat-funcall 'w32-shell-dos-semantics) "/c" "-c")
157 "Use this switch together with `tramp-encoding-shell' for local commands. 152 "Use this switch together with `tramp-encoding-shell' for local commands.
158See the variable `tramp-encoding-shell' for more information." 153See the variable `tramp-encoding-shell' for more information."
159 :group 'tramp 154 :group 'tramp
160 :type 'string 155 :type 'string)
161 :require 'tramp)
162 156
163(defcustom tramp-encoding-command-interactive 157(defcustom tramp-encoding-command-interactive
164 (unless (tramp-compat-funcall 'w32-shell-dos-semantics) "-i") 158 (unless (tramp-compat-funcall 'w32-shell-dos-semantics) "-i")
@@ -166,8 +160,7 @@ See the variable `tramp-encoding-shell' for more information."
166See the variable `tramp-encoding-shell' for more information." 160See the variable `tramp-encoding-shell' for more information."
167 :version "24.1" 161 :version "24.1"
168 :group 'tramp 162 :group 'tramp
169 :type '(choice (const nil) string) 163 :type '(choice (const nil) string))
170 :require 'tramp)
171 164
172;;;###tramp-autoload 165;;;###tramp-autoload
173(defvar tramp-methods nil 166(defvar tramp-methods nil
@@ -310,8 +303,7 @@ useful only in combination with `tramp-default-proxies-alist'.")
310See `tramp-methods' for possibilities. 303See `tramp-methods' for possibilities.
311Also see `tramp-default-method-alist'." 304Also see `tramp-default-method-alist'."
312 :group 'tramp 305 :group 'tramp
313 :type 'string 306 :type 'string)
314 :require 'tramp)
315 307
316;;;###tramp-autoload 308;;;###tramp-autoload
317(defcustom tramp-default-method-alist nil 309(defcustom tramp-default-method-alist nil
@@ -329,8 +321,7 @@ See `tramp-methods' for a list of possibilities for METHOD."
329 :group 'tramp 321 :group 'tramp
330 :type '(repeat (list (choice :tag "Host regexp" regexp sexp) 322 :type '(repeat (list (choice :tag "Host regexp" regexp sexp)
331 (choice :tag "User regexp" regexp sexp) 323 (choice :tag "User regexp" regexp sexp)
332 (choice :tag "Method name" string (const nil)))) 324 (choice :tag "Method name" string (const nil)))))
333 :require 'tramp)
334 325
335(defconst tramp-default-method-marker "-" 326(defconst tramp-default-method-marker "-"
336 "Marker for default method in remote file names.") 327 "Marker for default method in remote file names.")
@@ -342,8 +333,7 @@ It is nil by default; otherwise settings in configuration files like
342 333
343This variable is regarded as obsolete, and will be removed soon." 334This variable is regarded as obsolete, and will be removed soon."
344 :group 'tramp 335 :group 'tramp
345 :type '(choice (const nil) string) 336 :type '(choice (const nil) string))
346 :require 'tramp)
347 337
348;;;###tramp-autoload 338;;;###tramp-autoload
349(defcustom tramp-default-user-alist nil 339(defcustom tramp-default-user-alist nil
@@ -359,15 +349,13 @@ empty string for the method name."
359 :group 'tramp 349 :group 'tramp
360 :type '(repeat (list (choice :tag "Method regexp" regexp sexp) 350 :type '(repeat (list (choice :tag "Method regexp" regexp sexp)
361 (choice :tag " Host regexp" regexp sexp) 351 (choice :tag " Host regexp" regexp sexp)
362 (choice :tag " User name" string (const nil)))) 352 (choice :tag " User name" string (const nil)))))
363 :require 'tramp)
364 353
365(defcustom tramp-default-host (system-name) 354(defcustom tramp-default-host (system-name)
366 "Default host to use for transferring files. 355 "Default host to use for transferring files.
367Useful for su and sudo methods mostly." 356Useful for su and sudo methods mostly."
368 :group 'tramp 357 :group 'tramp
369 :type 'string 358 :type 'string)
370 :require 'tramp)
371 359
372;;;###tramp-autoload 360;;;###tramp-autoload
373(defcustom tramp-default-host-alist nil 361(defcustom tramp-default-host-alist nil
@@ -384,8 +372,7 @@ empty string for the method name."
384 :version "24.4" 372 :version "24.4"
385 :type '(repeat (list (choice :tag "Method regexp" regexp sexp) 373 :type '(repeat (list (choice :tag "Method regexp" regexp sexp)
386 (choice :tag " User regexp" regexp sexp) 374 (choice :tag " User regexp" regexp sexp)
387 (choice :tag " Host name" string (const nil)))) 375 (choice :tag " Host name" string (const nil)))))
388 :require 'tramp)
389 376
390(defcustom tramp-default-proxies-alist nil 377(defcustom tramp-default-proxies-alist nil
391 "Route to be followed for specific host/user pairs. 378 "Route to be followed for specific host/user pairs.
@@ -404,15 +391,13 @@ interpreted as a regular expression which always matches."
404 :group 'tramp 391 :group 'tramp
405 :type '(repeat (list (choice :tag "Host regexp" regexp sexp) 392 :type '(repeat (list (choice :tag "Host regexp" regexp sexp)
406 (choice :tag "User regexp" regexp sexp) 393 (choice :tag "User regexp" regexp sexp)
407 (choice :tag " Proxy name" string (const nil)))) 394 (choice :tag " Proxy name" string (const nil)))))
408 :require 'tramp)
409 395
410(defcustom tramp-save-ad-hoc-proxies nil 396(defcustom tramp-save-ad-hoc-proxies nil
411 "Whether to save ad-hoc proxies persistently." 397 "Whether to save ad-hoc proxies persistently."
412 :group 'tramp 398 :group 'tramp
413 :version "24.3" 399 :version "24.3"
414 :type 'boolean 400 :type 'boolean)
415 :require 'tramp)
416 401
417(defcustom tramp-restricted-shell-hosts-alist 402(defcustom tramp-restricted-shell-hosts-alist
418 (when (memq system-type '(windows-nt)) 403 (when (memq system-type '(windows-nt))
@@ -424,8 +409,7 @@ proxies only, see `tramp-default-proxies-alist'. If the local
424host runs a registered shell, it shall be added to this list, too." 409host runs a registered shell, it shall be added to this list, too."
425 :version "24.3" 410 :version "24.3"
426 :group 'tramp 411 :group 'tramp
427 :type '(repeat (regexp :tag "Host regexp")) 412 :type '(repeat (regexp :tag "Host regexp")))
428 :require 'tramp)
429 413
430;;;###tramp-autoload 414;;;###tramp-autoload
431(defcustom tramp-local-host-regexp 415(defcustom tramp-local-host-regexp
@@ -439,8 +423,7 @@ If the local host runs a chrooted environment, set this to nil."
439 :version "27.1" 423 :version "27.1"
440 :group 'tramp 424 :group 'tramp
441 :type '(choice (const :tag "Chrooted environment" nil) 425 :type '(choice (const :tag "Chrooted environment" nil)
442 (regexp :tag "Host regexp")) 426 (regexp :tag "Host regexp")))
443 :require 'tramp)
444 427
445(defvar tramp-completion-function-alist nil 428(defvar tramp-completion-function-alist nil
446 "Alist of methods for remote files. 429 "Alist of methods for remote files.
@@ -492,16 +475,14 @@ the remote shell.")
492 "String used for end of line in local processes." 475 "String used for end of line in local processes."
493 :version "24.1" 476 :version "24.1"
494 :group 'tramp 477 :group 'tramp
495 :type 'string 478 :type 'string)
496 :require 'tramp)
497 479
498(defcustom tramp-rsh-end-of-line "\n" 480(defcustom tramp-rsh-end-of-line "\n"
499 "String used for end of line in rsh connections. 481 "String used for end of line in rsh connections.
500I don't think this ever needs to be changed, so please tell me about it 482I don't think this ever needs to be changed, so please tell me about it
501if you need to change this." 483if you need to change this."
502 :group 'tramp 484 :group 'tramp
503 :type 'string 485 :type 'string)
504 :require 'tramp)
505 486
506(defcustom tramp-login-prompt-regexp 487(defcustom tramp-login-prompt-regexp
507 ".*\\(user\\|login\\)\\( .*\\)?: *" 488 ".*\\(user\\|login\\)\\( .*\\)?: *"
@@ -510,8 +491,7 @@ The regexp should match at end of buffer.
510 491
511Sometimes the prompt is reported to look like \"login as:\"." 492Sometimes the prompt is reported to look like \"login as:\"."
512 :group 'tramp 493 :group 'tramp
513 :type 'regexp 494 :type 'regexp)
514 :require 'tramp)
515 495
516(defcustom tramp-shell-prompt-pattern 496(defcustom tramp-shell-prompt-pattern
517 ;; Allow a prompt to start right after a ^M since it indeed would be 497 ;; 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.
533This regexp must match both `tramp-initial-end-of-output' and 513This regexp must match both `tramp-initial-end-of-output' and
534`tramp-end-of-output'." 514`tramp-end-of-output'."
535 :group 'tramp 515 :group 'tramp
536 :type 'regexp 516 :type 'regexp)
537 :require 'tramp)
538 517
539(defcustom tramp-password-prompt-regexp 518(defcustom tramp-password-prompt-regexp
540 (format "^.*\\(%s\\).*:\^@? *" 519 (format "^.*\\(%s\\).*:\^@? *"
@@ -547,8 +526,7 @@ The regexp should match at end of buffer.
547The `sudo' program appears to insert a `^@' character into the prompt." 526The `sudo' program appears to insert a `^@' character into the prompt."
548 :version "24.4" 527 :version "24.4"
549 :group 'tramp 528 :group 'tramp
550 :type 'regexp 529 :type 'regexp)
551 :require 'tramp)
552 530
553(defcustom tramp-wrong-passwd-regexp 531(defcustom tramp-wrong-passwd-regexp
554 (concat "^.*" 532 (concat "^.*"
@@ -573,8 +551,7 @@ The `sudo' program appears to insert a `^@' character into the prompt."
573 "Regexp matching a `login failed' message. 551 "Regexp matching a `login failed' message.
574The regexp should match at end of buffer." 552The regexp should match at end of buffer."
575 :group 'tramp 553 :group 'tramp
576 :type 'regexp 554 :type 'regexp)
577 :require 'tramp)
578 555
579(defcustom tramp-yesno-prompt-regexp 556(defcustom tramp-yesno-prompt-regexp
580 (concat 557 (concat
@@ -585,8 +562,7 @@ The confirmation should be done with yes or no.
585The regexp should match at end of buffer. 562The regexp should match at end of buffer.
586See also `tramp-yn-prompt-regexp'." 563See also `tramp-yn-prompt-regexp'."
587 :group 'tramp 564 :group 'tramp
588 :type 'regexp 565 :type 'regexp)
589 :require 'tramp)
590 566
591(defcustom tramp-yn-prompt-regexp 567(defcustom tramp-yn-prompt-regexp
592 (concat 568 (concat
@@ -599,8 +575,7 @@ The confirmation should be done with y or n.
599The regexp should match at end of buffer. 575The regexp should match at end of buffer.
600See also `tramp-yesno-prompt-regexp'." 576See also `tramp-yesno-prompt-regexp'."
601 :group 'tramp 577 :group 'tramp
602 :type 'regexp 578 :type 'regexp)
603 :require 'tramp)
604 579
605(defcustom tramp-terminal-prompt-regexp 580(defcustom tramp-terminal-prompt-regexp
606 (concat "\\(" 581 (concat "\\("
@@ -612,8 +587,7 @@ See also `tramp-yesno-prompt-regexp'."
612The regexp should match at end of buffer. 587The regexp should match at end of buffer.
613The answer will be provided by `tramp-action-terminal', which see." 588The answer will be provided by `tramp-action-terminal', which see."
614 :group 'tramp 589 :group 'tramp
615 :type 'regexp 590 :type 'regexp)
616 :require 'tramp)
617 591
618(defcustom tramp-operation-not-permitted-regexp 592(defcustom tramp-operation-not-permitted-regexp
619 (concat "\\(" "preserving times.*" "\\|" "set mode" "\\)" ":\\s-*" 593 (concat "\\(" "preserving times.*" "\\|" "set mode" "\\)" ":\\s-*"
@@ -622,8 +596,7 @@ The answer will be provided by `tramp-action-terminal', which see."
622Copying has been performed successfully already, so this message can 596Copying has been performed successfully already, so this message can
623be ignored safely." 597be ignored safely."
624 :group 'tramp 598 :group 'tramp
625 :type 'regexp 599 :type 'regexp)
626 :require 'tramp)
627 600
628(defcustom tramp-copy-failed-regexp 601(defcustom tramp-copy-failed-regexp
629 (concat "\\(.+: " 602 (concat "\\(.+: "
@@ -635,8 +608,7 @@ be ignored safely."
635 "\\)\\s-*") 608 "\\)\\s-*")
636 "Regular expression matching copy problems in (s)cp operations." 609 "Regular expression matching copy problems in (s)cp operations."
637 :group 'tramp 610 :group 'tramp
638 :type 'regexp 611 :type 'regexp)
639 :require 'tramp)
640 612
641(defcustom tramp-process-alive-regexp 613(defcustom tramp-process-alive-regexp
642 "" 614 ""
@@ -646,8 +618,7 @@ check regularly the status of the associated process.
646The answer will be provided by `tramp-action-process-alive', 618The answer will be provided by `tramp-action-process-alive',
647`tramp-action-out-of-band', which see." 619`tramp-action-out-of-band', which see."
648 :group 'tramp 620 :group 'tramp
649 :type 'regexp 621 :type 'regexp)
650 :require 'tramp)
651 622
652(defconst tramp-temp-name-prefix "tramp." 623(defconst tramp-temp-name-prefix "tramp."
653 "Prefix to use for temporary files. 624 "Prefix to use for temporary files.
@@ -996,8 +967,7 @@ initial value is overwritten by the car of `tramp-file-name-structure'.")
996 "Regular expression matching file names that are not under Tramp’s control." 967 "Regular expression matching file names that are not under Tramp’s control."
997 :version "27.1" 968 :version "27.1"
998 :group 'tramp 969 :group 'tramp
999 :type '(choice (const nil) string) 970 :type '(choice (const nil) regexp))
1000 :require 'tramp)
1001 971
1002(defconst tramp-completion-file-name-regexp-default 972(defconst tramp-completion-file-name-regexp-default
1003 (concat 973 (concat
@@ -1142,8 +1112,7 @@ in the third line of the code.
1142Please raise a bug report via \"M-x tramp-bug\" if your system needs 1112Please raise a bug report via \"M-x tramp-bug\" if your system needs
1143this variable to be set as well." 1113this variable to be set as well."
1144 :group 'tramp 1114 :group 'tramp
1145 :type '(choice (const nil) integer) 1115 :type '(choice (const nil) integer))
1146 :require 'tramp)
1147 1116
1148;; Logging in to a remote host normally requires obtaining a pty. But 1117;; Logging in to a remote host normally requires obtaining a pty. But
1149;; Emacs on macOS has process-connection-type set to nil by default, 1118;; Emacs on macOS has process-connection-type set to nil by default,
@@ -1154,8 +1123,7 @@ this variable to be set as well."
1154Tramp binds `process-connection-type' to the value given here before 1123Tramp binds `process-connection-type' to the value given here before
1155opening a connection to a remote host." 1124opening a connection to a remote host."
1156 :group 'tramp 1125 :group 'tramp
1157 :type '(choice (const nil) (const t) (const pty)) 1126 :type '(choice (const nil) (const t) (const pty)))
1158 :require 'tramp)
1159 1127
1160(defcustom tramp-connection-timeout 60 1128(defcustom tramp-connection-timeout 60
1161 "Defines the max time to wait for establishing a connection (in seconds). 1129 "Defines the max time to wait for establishing a connection (in seconds).
@@ -1164,8 +1132,7 @@ This can be overwritten for different connection types in `tramp-methods'.
1164The timeout does not include the time reading a password." 1132The timeout does not include the time reading a password."
1165 :group 'tramp 1133 :group 'tramp
1166 :version "24.4" 1134 :version "24.4"
1167 :type 'integer 1135 :type 'integer)
1168 :require 'tramp)
1169 1136
1170(defcustom tramp-connection-min-time-diff 5 1137(defcustom tramp-connection-min-time-diff 5
1171 "Defines seconds between two consecutive connection attempts. 1138 "Defines seconds between two consecutive connection attempts.
@@ -1179,8 +1146,7 @@ in a short time frame. In those cases it is recommended to
1179let-bind this variable." 1146let-bind this variable."
1180 :group 'tramp 1147 :group 'tramp
1181 :version "24.4" 1148 :version "24.4"
1182 :type '(choice (const nil) integer) 1149 :type '(choice (const nil) integer))
1183 :require 'tramp)
1184 1150
1185(defcustom tramp-completion-reread-directory-timeout 10 1151(defcustom tramp-completion-reread-directory-timeout 10
1186 "Defines seconds since last remote command before rereading a directory. 1152 "Defines seconds since last remote command before rereading a directory.
@@ -1192,8 +1158,7 @@ have been gone since last remote command execution. A value of t
1192would require an immediate reread during filename completion, nil 1158would require an immediate reread during filename completion, nil
1193means to use always cached values for the directory contents." 1159means to use always cached values for the directory contents."
1194 :group 'tramp 1160 :group 'tramp
1195 :type '(choice (const nil) (const t) integer) 1161 :type '(choice (const nil) (const t) integer))
1196 :require 'tramp)
1197 1162
1198;;; Internal Variables: 1163;;; Internal Variables:
1199 1164