diff options
| author | Chong Yidong | 2012-04-09 21:05:48 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-04-09 21:05:48 +0800 |
| commit | fb7ada5f94a71d73bf6cfad5cc87fe7fb26125a5 (patch) | |
| tree | eba43d1fa2427a77f1f6b1468838426b33ea5973 /lisp/net | |
| parent | a18ecafa99e7e7c3caa35ed68dd8a7b9b5d2b8e3 (diff) | |
| download | emacs-fb7ada5f94a71d73bf6cfad5cc87fe7fb26125a5.tar.gz emacs-fb7ada5f94a71d73bf6cfad5cc87fe7fb26125a5.zip | |
Remove * characters from the front of variable docstrings.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/ange-ftp.el | 10 | ||||
| -rw-r--r-- | lisp/net/goto-addr.el | 6 | ||||
| -rw-r--r-- | lisp/net/imap.el | 4 | ||||
| -rw-r--r-- | lisp/net/quickurl.el | 18 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 20 | ||||
| -rw-r--r-- | lisp/net/snmp-mode.el | 4 | ||||
| -rw-r--r-- | lisp/net/socks.el | 6 | ||||
| -rw-r--r-- | lisp/net/tramp-ftp.el | 2 | ||||
| -rw-r--r-- | lisp/net/tramp-gvfs.el | 4 | ||||
| -rw-r--r-- | lisp/net/tramp-gw.el | 8 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 12 | ||||
| -rw-r--r-- | lisp/net/tramp-smb.el | 8 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 102 | ||||
| -rw-r--r-- | lisp/net/webjump.el | 2 |
14 files changed, 103 insertions, 103 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 2a44148e4ce..455836fdae1 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el | |||
| @@ -697,11 +697,11 @@ parenthesized expressions in REGEXP for the components (in that order)." | |||
| 697 | 697 | ||
| 698 | (defvar ange-ftp-multi-msgs | 698 | (defvar ange-ftp-multi-msgs |
| 699 | "^150-\\|^220-\\|^230-\\|^226\\|^25.-\\|^221-\\|^200-\\|^331-\\|^4[25]1-\\|^530-" | 699 | "^150-\\|^220-\\|^230-\\|^226\\|^25.-\\|^221-\\|^200-\\|^331-\\|^4[25]1-\\|^530-" |
| 700 | "*Regular expression matching the start of a multiline FTP reply.") | 700 | "Regular expression matching the start of a multiline FTP reply.") |
| 701 | 701 | ||
| 702 | (defvar ange-ftp-good-msgs | 702 | (defvar ange-ftp-good-msgs |
| 703 | "^220 \\|^230 \\|^226 \\|^25. \\|^221 \\|^200 \\|^[Hh]ash mark" | 703 | "^220 \\|^230 \\|^226 \\|^25. \\|^221 \\|^200 \\|^[Hh]ash mark" |
| 704 | "*Regular expression matching FTP \"success\" messages.") | 704 | "Regular expression matching FTP \"success\" messages.") |
| 705 | 705 | ||
| 706 | ;; CMS and the odd VMS machine say 200 Port rather than 200 PORT. | 706 | ;; CMS and the odd VMS machine say 200 Port rather than 200 PORT. |
| 707 | ;; Also CMS machines use a multiline 550- reply to say that you | 707 | ;; Also CMS machines use a multiline 550- reply to say that you |
| @@ -908,7 +908,7 @@ matches the login banner." | |||
| 908 | (if (eq system-type 'hpux) | 908 | (if (eq system-type 'hpux) |
| 909 | "stty -onlcr -echo\n" | 909 | "stty -onlcr -echo\n" |
| 910 | "stty -echo nl\n") | 910 | "stty -echo nl\n") |
| 911 | "*Set up terminal after logging in to the gateway machine. | 911 | "Set up terminal after logging in to the gateway machine. |
| 912 | This command should stop the terminal from echoing each command, and | 912 | This command should stop the terminal from echoing each command, and |
| 913 | arrange to strip out trailing ^M characters.") | 913 | arrange to strip out trailing ^M characters.") |
| 914 | 914 | ||
| @@ -2098,7 +2098,7 @@ suffix of the form #PORT to specify a non-default port." | |||
| 2098 | ;; ange@hplb.hpl.hp.com says this should not be changed. | 2098 | ;; ange@hplb.hpl.hp.com says this should not be changed. |
| 2099 | (defvar ange-ftp-hash-mark-msgs | 2099 | (defvar ange-ftp-hash-mark-msgs |
| 2100 | "[hH]ash mark [^0-9]*\\([0-9]+\\)" | 2100 | "[hH]ash mark [^0-9]*\\([0-9]+\\)" |
| 2101 | "*Regexp matching the FTP client's output upon doing a HASH command.") | 2101 | "Regexp matching the FTP client's output upon doing a HASH command.") |
| 2102 | 2102 | ||
| 2103 | (defun ange-ftp-guess-hash-mark-size (proc) | 2103 | (defun ange-ftp-guess-hash-mark-size (proc) |
| 2104 | (if ange-ftp-send-hash | 2104 | (if ange-ftp-send-hash |
| @@ -6079,7 +6079,7 @@ Other orders of $ and _ seem to all work just fine.") | |||
| 6079 | 6079 | ||
| 6080 | (defcustom ange-ftp-bs2000-additional-pubsets | 6080 | (defcustom ange-ftp-bs2000-additional-pubsets |
| 6081 | nil | 6081 | nil |
| 6082 | "*List of additional pubsets available to all users." | 6082 | "List of additional pubsets available to all users." |
| 6083 | :group 'ange-ftp | 6083 | :group 'ange-ftp |
| 6084 | :type '(repeat string)) | 6084 | :type '(repeat string)) |
| 6085 | 6085 | ||
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el index e5fe45b5bf0..6a9d80f9672 100644 --- a/lisp/net/goto-addr.el +++ b/lisp/net/goto-addr.el | |||
| @@ -80,18 +80,18 @@ | |||
| 80 | 80 | ||
| 81 | ;; I don't expect users to want fontify'ing without highlighting. | 81 | ;; I don't expect users to want fontify'ing without highlighting. |
| 82 | (defcustom goto-address-fontify-p t | 82 | (defcustom goto-address-fontify-p t |
| 83 | "*Non-nil means URLs and e-mail addresses in buffer are fontified. | 83 | "Non-nil means URLs and e-mail addresses in buffer are fontified. |
| 84 | But only if `goto-address-highlight-p' is also non-nil." | 84 | But only if `goto-address-highlight-p' is also non-nil." |
| 85 | :type 'boolean | 85 | :type 'boolean |
| 86 | :group 'goto-address) | 86 | :group 'goto-address) |
| 87 | 87 | ||
| 88 | (defcustom goto-address-highlight-p t | 88 | (defcustom goto-address-highlight-p t |
| 89 | "*Non-nil means URLs and e-mail addresses in buffer are highlighted." | 89 | "Non-nil means URLs and e-mail addresses in buffer are highlighted." |
| 90 | :type 'boolean | 90 | :type 'boolean |
| 91 | :group 'goto-address) | 91 | :group 'goto-address) |
| 92 | 92 | ||
| 93 | (defcustom goto-address-fontify-maximum-size 30000 | 93 | (defcustom goto-address-fontify-maximum-size 30000 |
| 94 | "*Maximum size of file in which to fontify and/or highlight URLs. | 94 | "Maximum size of file in which to fontify and/or highlight URLs. |
| 95 | A value of t means there is no limit--fontify regardless of the size." | 95 | A value of t means there is no limit--fontify regardless of the size." |
| 96 | :type '(choice (integer :tag "Maximum size") (const :tag "No limit" t)) | 96 | :type '(choice (integer :tag "Maximum size") (const :tag "No limit" t)) |
| 97 | :group 'goto-address) | 97 | :group 'goto-address) |
diff --git a/lisp/net/imap.el b/lisp/net/imap.el index 6a25be73615..853839c2061 100644 --- a/lisp/net/imap.el +++ b/lisp/net/imap.el | |||
| @@ -211,7 +211,7 @@ until a successful connection is made." | |||
| 211 | :type '(repeat string)) | 211 | :type '(repeat string)) |
| 212 | 212 | ||
| 213 | (defcustom imap-process-connection-type nil | 213 | (defcustom imap-process-connection-type nil |
| 214 | "*Value for `process-connection-type' to use for Kerberos4, GSSAPI, shell, and SSL. | 214 | "Value for `process-connection-type' to use for Kerberos4, GSSAPI, shell, and SSL. |
| 215 | The `process-connection-type' variable controls the type of device | 215 | The `process-connection-type' variable controls the type of device |
| 216 | used to communicate with subprocesses. Values are nil to use a | 216 | used to communicate with subprocesses. Values are nil to use a |
| 217 | pipe, or t or `pty' to use a pty. The value has no effect if the | 217 | pipe, or t or `pty' to use a pty. The value has no effect if the |
| @@ -271,7 +271,7 @@ See also `imap-log'." | |||
| 271 | (symbol-name system-type)) | 271 | (symbol-name system-type)) |
| 272 | 1.0 | 272 | 1.0 |
| 273 | 0.1) | 273 | 0.1) |
| 274 | "*How long to wait between checking for the end of output. | 274 | "How long to wait between checking for the end of output. |
| 275 | Shorter values mean quicker response, but is more CPU intensive." | 275 | Shorter values mean quicker response, but is more CPU intensive." |
| 276 | :type 'number | 276 | :type 'number |
| 277 | :group 'imap) | 277 | :group 'imap) |
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el index 8d6aedff562..b0bfe5b271c 100644 --- a/lisp/net/quickurl.el +++ b/lisp/net/quickurl.el | |||
| @@ -96,12 +96,12 @@ | |||
| 96 | :prefix "quickurl-") | 96 | :prefix "quickurl-") |
| 97 | 97 | ||
| 98 | (defcustom quickurl-url-file (convert-standard-filename "~/.quickurls") | 98 | (defcustom quickurl-url-file (convert-standard-filename "~/.quickurls") |
| 99 | "*File that contains the URL list." | 99 | "File that contains the URL list." |
| 100 | :type 'file | 100 | :type 'file |
| 101 | :group 'quickurl) | 101 | :group 'quickurl) |
| 102 | 102 | ||
| 103 | (defcustom quickurl-format-function (lambda (url) (format "<URL:%s>" (quickurl-url-url url))) | 103 | (defcustom quickurl-format-function (lambda (url) (format "<URL:%s>" (quickurl-url-url url))) |
| 104 | "*Function to format the URL before insertion into the current buffer." | 104 | "Function to format the URL before insertion into the current buffer." |
| 105 | :type 'function | 105 | :type 'function |
| 106 | :group 'quickurl) | 106 | :group 'quickurl) |
| 107 | 107 | ||
| @@ -111,32 +111,32 @@ | |||
| 111 | (string< | 111 | (string< |
| 112 | (downcase (quickurl-url-description x)) | 112 | (downcase (quickurl-url-description x)) |
| 113 | (downcase (quickurl-url-description y)))))) | 113 | (downcase (quickurl-url-description y)))))) |
| 114 | "*Function to sort the URL list." | 114 | "Function to sort the URL list." |
| 115 | :type 'function | 115 | :type 'function |
| 116 | :group 'quickurl) | 116 | :group 'quickurl) |
| 117 | 117 | ||
| 118 | (defcustom quickurl-grab-lookup-function #'current-word | 118 | (defcustom quickurl-grab-lookup-function #'current-word |
| 119 | "*Function to grab the thing to lookup." | 119 | "Function to grab the thing to lookup." |
| 120 | :type 'function | 120 | :type 'function |
| 121 | :group 'quickurl) | 121 | :group 'quickurl) |
| 122 | 122 | ||
| 123 | (defcustom quickurl-assoc-function #'assoc-ignore-case | 123 | (defcustom quickurl-assoc-function #'assoc-ignore-case |
| 124 | "*Function to use for alist lookup into `quickurl-urls'." | 124 | "Function to use for alist lookup into `quickurl-urls'." |
| 125 | :type 'function | 125 | :type 'function |
| 126 | :group 'quickurl) | 126 | :group 'quickurl) |
| 127 | 127 | ||
| 128 | (defcustom quickurl-completion-ignore-case t | 128 | (defcustom quickurl-completion-ignore-case t |
| 129 | "*Should `quickurl-ask' ignore case when doing the input lookup?" | 129 | "Should `quickurl-ask' ignore case when doing the input lookup?" |
| 130 | :type 'boolean | 130 | :type 'boolean |
| 131 | :group 'quickurl) | 131 | :group 'quickurl) |
| 132 | 132 | ||
| 133 | (defcustom quickurl-prefix ";; -*- lisp -*-\n\n" | 133 | (defcustom quickurl-prefix ";; -*- lisp -*-\n\n" |
| 134 | "*Text to write to `quickurl-url-file' before writing the URL list." | 134 | "Text to write to `quickurl-url-file' before writing the URL list." |
| 135 | :type 'string | 135 | :type 'string |
| 136 | :group 'quickurl) | 136 | :group 'quickurl) |
| 137 | 137 | ||
| 138 | (defcustom quickurl-postfix "" | 138 | (defcustom quickurl-postfix "" |
| 139 | "*Text to write to `quickurl-url-file' after writing the URL list. | 139 | "Text to write to `quickurl-url-file' after writing the URL list. |
| 140 | 140 | ||
| 141 | See the constant `quickurl-reread-hook-postfix' for some example text that | 141 | See the constant `quickurl-reread-hook-postfix' for some example text that |
| 142 | could be used here." | 142 | could be used here." |
| @@ -144,7 +144,7 @@ could be used here." | |||
| 144 | :group 'quickurl) | 144 | :group 'quickurl) |
| 145 | 145 | ||
| 146 | (defcustom quickurl-list-mode-hook nil | 146 | (defcustom quickurl-list-mode-hook nil |
| 147 | "*Hooks for `quickurl-list-mode'." | 147 | "Hooks for `quickurl-list-mode'." |
| 148 | :type 'hook | 148 | :type 'hook |
| 149 | :group 'quickurl) | 149 | :group 'quickurl) |
| 150 | 150 | ||
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index d09b6aa831f..9d7e8664542 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el | |||
| @@ -139,12 +139,12 @@ for connections using SSL/TLS." | |||
| 139 | :group 'rcirc) | 139 | :group 'rcirc) |
| 140 | 140 | ||
| 141 | (defcustom rcirc-fill-flag t | 141 | (defcustom rcirc-fill-flag t |
| 142 | "*Non-nil means line-wrap messages printed in channel buffers." | 142 | "Non-nil means line-wrap messages printed in channel buffers." |
| 143 | :type 'boolean | 143 | :type 'boolean |
| 144 | :group 'rcirc) | 144 | :group 'rcirc) |
| 145 | 145 | ||
| 146 | (defcustom rcirc-fill-column nil | 146 | (defcustom rcirc-fill-column nil |
| 147 | "*Column beyond which automatic line-wrapping should happen. | 147 | "Column beyond which automatic line-wrapping should happen. |
| 148 | If nil, use value of `fill-column'. If 'frame-width, use the | 148 | If nil, use value of `fill-column'. If 'frame-width, use the |
| 149 | maximum frame width." | 149 | maximum frame width." |
| 150 | :type '(choice (const :tag "Value of `fill-column'") | 150 | :type '(choice (const :tag "Value of `fill-column'") |
| @@ -153,7 +153,7 @@ maximum frame width." | |||
| 153 | :group 'rcirc) | 153 | :group 'rcirc) |
| 154 | 154 | ||
| 155 | (defcustom rcirc-fill-prefix nil | 155 | (defcustom rcirc-fill-prefix nil |
| 156 | "*Text to insert before filled lines. | 156 | "Text to insert before filled lines. |
| 157 | If nil, calculate the prefix dynamically to line up text | 157 | If nil, calculate the prefix dynamically to line up text |
| 158 | underneath each nick." | 158 | underneath each nick." |
| 159 | :type '(choice (const :tag "Dynamic" nil) | 159 | :type '(choice (const :tag "Dynamic" nil) |
| @@ -174,23 +174,23 @@ Use the command `rcirc-omit-mode' to change this variable.") | |||
| 174 | (make-variable-buffer-local 'rcirc-omit-mode) | 174 | (make-variable-buffer-local 'rcirc-omit-mode) |
| 175 | 175 | ||
| 176 | (defcustom rcirc-time-format "%H:%M " | 176 | (defcustom rcirc-time-format "%H:%M " |
| 177 | "*Describes how timestamps are printed. | 177 | "Describes how timestamps are printed. |
| 178 | Used as the first arg to `format-time-string'." | 178 | Used as the first arg to `format-time-string'." |
| 179 | :type 'string | 179 | :type 'string |
| 180 | :group 'rcirc) | 180 | :group 'rcirc) |
| 181 | 181 | ||
| 182 | (defcustom rcirc-input-ring-size 1024 | 182 | (defcustom rcirc-input-ring-size 1024 |
| 183 | "*Size of input history ring." | 183 | "Size of input history ring." |
| 184 | :type 'integer | 184 | :type 'integer |
| 185 | :group 'rcirc) | 185 | :group 'rcirc) |
| 186 | 186 | ||
| 187 | (defcustom rcirc-read-only-flag t | 187 | (defcustom rcirc-read-only-flag t |
| 188 | "*Non-nil means make text in IRC buffers read-only." | 188 | "Non-nil means make text in IRC buffers read-only." |
| 189 | :type 'boolean | 189 | :type 'boolean |
| 190 | :group 'rcirc) | 190 | :group 'rcirc) |
| 191 | 191 | ||
| 192 | (defcustom rcirc-buffer-maximum-lines nil | 192 | (defcustom rcirc-buffer-maximum-lines nil |
| 193 | "*The maximum size in lines for rcirc buffers. | 193 | "The maximum size in lines for rcirc buffers. |
| 194 | Channel buffers are truncated from the top to be no greater than this | 194 | Channel buffers are truncated from the top to be no greater than this |
| 195 | number. If zero or nil, no truncating is done." | 195 | number. If zero or nil, no truncating is done." |
| 196 | :type '(choice (const :tag "No truncation" nil) | 196 | :type '(choice (const :tag "No truncation" nil) |
| @@ -198,7 +198,7 @@ number. If zero or nil, no truncating is done." | |||
| 198 | :group 'rcirc) | 198 | :group 'rcirc) |
| 199 | 199 | ||
| 200 | (defcustom rcirc-scroll-show-maximum-output t | 200 | (defcustom rcirc-scroll-show-maximum-output t |
| 201 | "*If non-nil, scroll buffer to keep the point at the bottom of | 201 | "If non-nil, scroll buffer to keep the point at the bottom of |
| 202 | the window." | 202 | the window." |
| 203 | :type 'boolean | 203 | :type 'boolean |
| 204 | :group 'rcirc) | 204 | :group 'rcirc) |
| @@ -244,13 +244,13 @@ Examples: | |||
| 244 | :group 'rcirc) | 244 | :group 'rcirc) |
| 245 | 245 | ||
| 246 | (defcustom rcirc-auto-authenticate-flag t | 246 | (defcustom rcirc-auto-authenticate-flag t |
| 247 | "*Non-nil means automatically send authentication string to server. | 247 | "Non-nil means automatically send authentication string to server. |
| 248 | See also `rcirc-authinfo'." | 248 | See also `rcirc-authinfo'." |
| 249 | :type 'boolean | 249 | :type 'boolean |
| 250 | :group 'rcirc) | 250 | :group 'rcirc) |
| 251 | 251 | ||
| 252 | (defcustom rcirc-authenticate-before-join t | 252 | (defcustom rcirc-authenticate-before-join t |
| 253 | "*Non-nil means authenticate to services before joining channels. | 253 | "Non-nil means authenticate to services before joining channels. |
| 254 | Currently only works with NickServ on some networks." | 254 | Currently only works with NickServ on some networks." |
| 255 | :version "24.1" | 255 | :version "24.1" |
| 256 | :type 'boolean | 256 | :type 'boolean |
diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el index 42b6f482665..d3e5759d2fb 100644 --- a/lisp/net/snmp-mode.el +++ b/lisp/net/snmp-mode.el | |||
| @@ -141,10 +141,10 @@ This is used during Tempo template completion." | |||
| 141 | :group 'snmp) | 141 | :group 'snmp) |
| 142 | 142 | ||
| 143 | (defvar snmp-tempo-tags nil | 143 | (defvar snmp-tempo-tags nil |
| 144 | "*Tempo tags for SNMP mode.") | 144 | "Tempo tags for SNMP mode.") |
| 145 | 145 | ||
| 146 | (defvar snmpv2-tempo-tags nil | 146 | (defvar snmpv2-tempo-tags nil |
| 147 | "*Tempo tags for SNMPv2 mode.") | 147 | "Tempo tags for SNMPv2 mode.") |
| 148 | 148 | ||
| 149 | 149 | ||
| 150 | ;; Enable fontification for SNMP MIBs | 150 | ;; Enable fontification for SNMP MIBs |
diff --git a/lisp/net/socks.el b/lisp/net/socks.el index 3c94e7d1b22..306376f8af2 100644 --- a/lisp/net/socks.el +++ b/lisp/net/socks.el | |||
| @@ -343,7 +343,7 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"." | |||
| 343 | ;; could get a wrapper hook, or defer to open-network-stream-function. | 343 | ;; could get a wrapper hook, or defer to open-network-stream-function. |
| 344 | 344 | ||
| 345 | (defvar socks-override-functions nil | 345 | (defvar socks-override-functions nil |
| 346 | "*Whether to overwrite the open-network-stream function with the SOCKSified | 346 | "Whether to overwrite the open-network-stream function with the SOCKSified |
| 347 | version.") | 347 | version.") |
| 348 | 348 | ||
| 349 | (require 'network-stream) | 349 | (require 'network-stream) |
| @@ -480,7 +480,7 @@ version.") | |||
| 480 | 480 | ||
| 481 | ;; Replacement functions for open-network-stream, etc. | 481 | ;; Replacement functions for open-network-stream, etc. |
| 482 | (defvar socks-noproxy nil | 482 | (defvar socks-noproxy nil |
| 483 | "*List of regexps matching hosts that we should not socksify connections to") | 483 | "List of regexps matching hosts that we should not socksify connections to") |
| 484 | 484 | ||
| 485 | (defun socks-find-route (host service) | 485 | (defun socks-find-route (host service) |
| 486 | (let ((route socks-server) | 486 | (let ((route socks-server) |
| @@ -626,7 +626,7 @@ version.") | |||
| 626 | 626 | ||
| 627 | 627 | ||
| 628 | (defcustom socks-nslookup-program "nslookup" | 628 | (defcustom socks-nslookup-program "nslookup" |
| 629 | "*If non-NIL then a string naming the nslookup program." | 629 | "If non-NIL then a string naming the nslookup program." |
| 630 | :type '(choice (const :tag "None" :value nil) string) | 630 | :type '(choice (const :tag "None" :value nil) string) |
| 631 | :group 'socks) | 631 | :group 'socks) |
| 632 | 632 | ||
diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el index 4b5b08cf7e1..73bc6878115 100644 --- a/lisp/net/tramp-ftp.el +++ b/lisp/net/tramp-ftp.el | |||
| @@ -99,7 +99,7 @@ present for backward compatibility." | |||
| 99 | ;; Define FTP method ... | 99 | ;; Define FTP method ... |
| 100 | ;;;###tramp-autoload | 100 | ;;;###tramp-autoload |
| 101 | (defconst tramp-ftp-method "ftp" | 101 | (defconst tramp-ftp-method "ftp" |
| 102 | "*When this method name is used, forward all calls to Ange-FTP.") | 102 | "When this method name is used, forward all calls to Ange-FTP.") |
| 103 | 103 | ||
| 104 | ;; ... and add it to the method list. | 104 | ;; ... and add it to the method list. |
| 105 | ;;;###tramp-autoload | 105 | ;;;###tramp-autoload |
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index 6f3c5e04236..983b29dcb5e 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el | |||
| @@ -111,7 +111,7 @@ | |||
| 111 | 111 | ||
| 112 | ;;;###tramp-autoload | 112 | ;;;###tramp-autoload |
| 113 | (defcustom tramp-gvfs-methods '("dav" "davs" "obex" "synce") | 113 | (defcustom tramp-gvfs-methods '("dav" "davs" "obex" "synce") |
| 114 | "*List of methods for remote files, accessed with GVFS." | 114 | "List of methods for remote files, accessed with GVFS." |
| 115 | :group 'tramp | 115 | :group 'tramp |
| 116 | :version "23.2" | 116 | :version "23.2" |
| 117 | :type '(repeat (choice (const "dav") | 117 | :type '(repeat (choice (const "dav") |
| @@ -128,7 +128,7 @@ | |||
| 128 | (add-to-list 'tramp-default-user-alist '("\\`synce\\'" nil nil)) | 128 | (add-to-list 'tramp-default-user-alist '("\\`synce\\'" nil nil)) |
| 129 | 129 | ||
| 130 | (defcustom tramp-gvfs-zeroconf-domain "local" | 130 | (defcustom tramp-gvfs-zeroconf-domain "local" |
| 131 | "*Zeroconf domain to be used for discovering services, like host names." | 131 | "Zeroconf domain to be used for discovering services, like host names." |
| 132 | :group 'tramp | 132 | :group 'tramp |
| 133 | :version "23.2" | 133 | :version "23.2" |
| 134 | :type 'string) | 134 | :type 'string) |
diff --git a/lisp/net/tramp-gw.el b/lisp/net/tramp-gw.el index de42c402a63..328d094dfa4 100644 --- a/lisp/net/tramp-gw.el +++ b/lisp/net/tramp-gw.el | |||
| @@ -50,20 +50,20 @@ | |||
| 50 | ;; Define HTTP tunnel method ... | 50 | ;; Define HTTP tunnel method ... |
| 51 | ;;;###tramp-autoload | 51 | ;;;###tramp-autoload |
| 52 | (defconst tramp-gw-tunnel-method "tunnel" | 52 | (defconst tramp-gw-tunnel-method "tunnel" |
| 53 | "*Method to connect HTTP gateways.") | 53 | "Method to connect HTTP gateways.") |
| 54 | 54 | ||
| 55 | ;; ... and port. | 55 | ;; ... and port. |
| 56 | (defconst tramp-gw-default-tunnel-port 8080 | 56 | (defconst tramp-gw-default-tunnel-port 8080 |
| 57 | "*Default port for HTTP gateways.") | 57 | "Default port for HTTP gateways.") |
| 58 | 58 | ||
| 59 | ;; Define SOCKS method ... | 59 | ;; Define SOCKS method ... |
| 60 | ;;;###tramp-autoload | 60 | ;;;###tramp-autoload |
| 61 | (defconst tramp-gw-socks-method "socks" | 61 | (defconst tramp-gw-socks-method "socks" |
| 62 | "*Method to connect SOCKS servers.") | 62 | "Method to connect SOCKS servers.") |
| 63 | 63 | ||
| 64 | ;; ... and port. | 64 | ;; ... and port. |
| 65 | (defconst tramp-gw-default-socks-port 1080 | 65 | (defconst tramp-gw-default-socks-port 1080 |
| 66 | "*Default port for SOCKS servers.") | 66 | "Default port for SOCKS servers.") |
| 67 | 67 | ||
| 68 | ;; Autoload the socks library. It is used only when we access a SOCKS server. | 68 | ;; Autoload the socks library. It is used only when we access a SOCKS server. |
| 69 | (autoload 'socks-open-network-stream "socks") | 69 | (autoload 'socks-open-network-stream "socks") |
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 1c23a6f20f3..b3a5341b3a6 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | ;; `dired-insert-set-properties'. | 43 | ;; `dired-insert-set-properties'. |
| 44 | 44 | ||
| 45 | (defcustom tramp-inline-compress-start-size 4096 | 45 | (defcustom tramp-inline-compress-start-size 4096 |
| 46 | "*The minimum size of compressing where inline transfer. | 46 | "The minimum size of compressing where inline transfer. |
| 47 | When inline transfer, compress transferred data of file | 47 | When inline transfer, compress transferred data of file |
| 48 | whose size is this value or above (up to `tramp-copy-size-limit'). | 48 | whose size is this value or above (up to `tramp-copy-size-limit'). |
| 49 | If it is nil, no compression at all will be applied." | 49 | If it is nil, no compression at all will be applied." |
| @@ -51,14 +51,14 @@ If it is nil, no compression at all will be applied." | |||
| 51 | :type '(choice (const nil) integer)) | 51 | :type '(choice (const nil) integer)) |
| 52 | 52 | ||
| 53 | (defcustom tramp-copy-size-limit 10240 | 53 | (defcustom tramp-copy-size-limit 10240 |
| 54 | "*The maximum file size where inline copying is preferred over an out-of-the-band copy. | 54 | "The maximum file size where inline copying is preferred over an out-of-the-band copy. |
| 55 | If it is nil, inline out-of-the-band copy will be used without a check." | 55 | If it is nil, inline out-of-the-band copy will be used without a check." |
| 56 | :group 'tramp | 56 | :group 'tramp |
| 57 | :type '(choice (const nil) integer)) | 57 | :type '(choice (const nil) integer)) |
| 58 | 58 | ||
| 59 | ;;;###tramp-autoload | 59 | ;;;###tramp-autoload |
| 60 | (defcustom tramp-terminal-type "dumb" | 60 | (defcustom tramp-terminal-type "dumb" |
| 61 | "*Value of TERM environment variable for logging in to remote host. | 61 | "Value of TERM environment variable for logging in to remote host. |
| 62 | Because Tramp wants to parse the output of the remote shell, it is easily | 62 | Because Tramp wants to parse the output of the remote shell, it is easily |
| 63 | confused by ANSI color escape sequences and suchlike. Often, shell init | 63 | confused by ANSI color escape sequences and suchlike. Often, shell init |
| 64 | files conditionalize this setup based on the TERM environment variable." | 64 | files conditionalize this setup based on the TERM environment variable." |
| @@ -516,7 +516,7 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 516 | '(tramp-default-remote-path "/bin" "/usr/bin" "/usr/sbin" "/usr/local/bin" | 516 | '(tramp-default-remote-path "/bin" "/usr/bin" "/usr/sbin" "/usr/local/bin" |
| 517 | "/local/bin" "/local/freeware/bin" "/local/gnu/bin" | 517 | "/local/bin" "/local/freeware/bin" "/local/gnu/bin" |
| 518 | "/usr/freeware/bin" "/usr/pkg/bin" "/usr/contrib/bin") | 518 | "/usr/freeware/bin" "/usr/pkg/bin" "/usr/contrib/bin") |
| 519 | "*List of directories to search for executables on remote host. | 519 | "List of directories to search for executables on remote host. |
| 520 | For every remote host, this variable will be set buffer local, | 520 | For every remote host, this variable will be set buffer local, |
| 521 | keeping the list of existing directories on that host. | 521 | keeping the list of existing directories on that host. |
| 522 | 522 | ||
| @@ -546,7 +546,7 @@ as given in your `~/.profile'." | |||
| 546 | "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=\"\"" | 546 | "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=\"\"" |
| 547 | "autocorrect=" "correct=") | 547 | "autocorrect=" "correct=") |
| 548 | 548 | ||
| 549 | "*List of environment variables to be set on the remote host. | 549 | "List of environment variables to be set on the remote host. |
| 550 | 550 | ||
| 551 | Each element should be a string of the form ENVVARNAME=VALUE. An | 551 | Each element should be a string of the form ENVVARNAME=VALUE. An |
| 552 | entry ENVVARNAME= disables the corresponding environment variable, | 552 | entry ENVVARNAME= disables the corresponding environment variable, |
| @@ -558,7 +558,7 @@ not be set here. Instead, it should be set via `tramp-remote-path'." | |||
| 558 | :type '(repeat string)) | 558 | :type '(repeat string)) |
| 559 | 559 | ||
| 560 | (defcustom tramp-sh-extra-args '(("/bash\\'" . "-norc -noprofile")) | 560 | (defcustom tramp-sh-extra-args '(("/bash\\'" . "-norc -noprofile")) |
| 561 | "*Alist specifying extra arguments to pass to the remote shell. | 561 | "Alist specifying extra arguments to pass to the remote shell. |
| 562 | Entries are (REGEXP . ARGS) where REGEXP is a regular expression | 562 | Entries are (REGEXP . ARGS) where REGEXP is a regular expression |
| 563 | matching the shell file name and ARGS is a string specifying the | 563 | matching the shell file name and ARGS is a string specifying the |
| 564 | arguments. | 564 | arguments. |
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index d3f0d8afb12..f1535ae64c0 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | ;; Define SMB method ... | 33 | ;; Define SMB method ... |
| 34 | ;;;###tramp-autoload | 34 | ;;;###tramp-autoload |
| 35 | (defconst tramp-smb-method "smb" | 35 | (defconst tramp-smb-method "smb" |
| 36 | "*Method to connect SAMBA and M$ SMB servers.") | 36 | "Method to connect SAMBA and M$ SMB servers.") |
| 37 | 37 | ||
| 38 | ;; ... and add it to the method list. | 38 | ;; ... and add it to the method list. |
| 39 | ;;;###tramp-autoload | 39 | ;;;###tramp-autoload |
| @@ -68,19 +68,19 @@ | |||
| 68 | '((tramp-parse-netrc "~/.netrc")))) | 68 | '((tramp-parse-netrc "~/.netrc")))) |
| 69 | 69 | ||
| 70 | (defcustom tramp-smb-program "smbclient" | 70 | (defcustom tramp-smb-program "smbclient" |
| 71 | "*Name of SMB client to run." | 71 | "Name of SMB client to run." |
| 72 | :group 'tramp | 72 | :group 'tramp |
| 73 | :type 'string) | 73 | :type 'string) |
| 74 | 74 | ||
| 75 | (defcustom tramp-smb-conf "/dev/null" | 75 | (defcustom tramp-smb-conf "/dev/null" |
| 76 | "*Path of the smb.conf file. | 76 | "Path of the smb.conf file. |
| 77 | If it is nil, no smb.conf will be added to the `tramp-smb-program' | 77 | If it is nil, no smb.conf will be added to the `tramp-smb-program' |
| 78 | call, letting the SMB client use the default one." | 78 | call, letting the SMB client use the default one." |
| 79 | :group 'tramp | 79 | :group 'tramp |
| 80 | :type '(choice (const nil) (file :must-match t))) | 80 | :type '(choice (const nil) (file :must-match t))) |
| 81 | 81 | ||
| 82 | (defvar tramp-smb-version nil | 82 | (defvar tramp-smb-version nil |
| 83 | "*Version string of the SMB client.") | 83 | "Version string of the SMB client.") |
| 84 | 84 | ||
| 85 | (defconst tramp-smb-prompt "^smb: .+> \\|^\\s-+Server\\s-+Comment$" | 85 | (defconst tramp-smb-prompt "^smb: .+> \\|^\\s-+Server\\s-+Comment$" |
| 86 | "Regexp used as prompt in smbclient.") | 86 | "Regexp used as prompt in smbclient.") |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index c092202b10a..5b4ea1e6f17 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -70,13 +70,13 @@ | |||
| 70 | ;; Maybe we need once a real Tramp mode, with key bindings etc. | 70 | ;; Maybe we need once a real Tramp mode, with key bindings etc. |
| 71 | ;;;###autoload | 71 | ;;;###autoload |
| 72 | (defcustom tramp-mode t | 72 | (defcustom tramp-mode t |
| 73 | "*Whether Tramp is enabled. | 73 | "Whether Tramp is enabled. |
| 74 | If it is set to nil, all remote file names are used literally." | 74 | If it is set to nil, all remote file names are used literally." |
| 75 | :group 'tramp | 75 | :group 'tramp |
| 76 | :type 'boolean) | 76 | :type 'boolean) |
| 77 | 77 | ||
| 78 | (defcustom tramp-verbose 3 | 78 | (defcustom tramp-verbose 3 |
| 79 | "*Verbosity level for Tramp messages. | 79 | "Verbosity level for Tramp messages. |
| 80 | Any level x includes messages for all levels 1 .. x-1. The levels are | 80 | Any level x includes messages for all levels 1 .. x-1. The levels are |
| 81 | 81 | ||
| 82 | 0 silent (no tramp messages at all) | 82 | 0 silent (no tramp messages at all) |
| @@ -137,7 +137,7 @@ policy for local files." | |||
| 137 | :group 'tramp))) | 137 | :group 'tramp))) |
| 138 | 138 | ||
| 139 | (defcustom tramp-auto-save-directory nil | 139 | (defcustom tramp-auto-save-directory nil |
| 140 | "*Put auto-save files in this directory, if set. | 140 | "Put auto-save files in this directory, if set. |
| 141 | The idea is to use a local directory so that auto-saving is faster." | 141 | The idea is to use a local directory so that auto-saving is faster." |
| 142 | :group 'tramp | 142 | :group 'tramp |
| 143 | :type '(choice (const nil) string)) | 143 | :type '(choice (const nil) string)) |
| @@ -146,7 +146,7 @@ The idea is to use a local directory so that auto-saving is faster." | |||
| 146 | (if (memq system-type '(windows-nt)) | 146 | (if (memq system-type '(windows-nt)) |
| 147 | (getenv "COMSPEC") | 147 | (getenv "COMSPEC") |
| 148 | "/bin/sh") | 148 | "/bin/sh") |
| 149 | "*Use this program for encoding and decoding commands on the local host. | 149 | "Use this program for encoding and decoding commands on the local host. |
| 150 | This shell is used to execute the encoding and decoding command on the | 150 | This shell is used to execute the encoding and decoding command on the |
| 151 | local host, so if you want to use `~' in those commands, you should | 151 | local host, so if you want to use `~' in those commands, you should |
| 152 | choose a shell here which groks tilde expansion. `/bin/sh' normally | 152 | choose a shell here which groks tilde expansion. `/bin/sh' normally |
| @@ -172,14 +172,14 @@ use for the remote host." | |||
| 172 | (if (string-match "cmd\\.exe" tramp-encoding-shell) | 172 | (if (string-match "cmd\\.exe" tramp-encoding-shell) |
| 173 | "/c" | 173 | "/c" |
| 174 | "-c") | 174 | "-c") |
| 175 | "*Use this switch together with `tramp-encoding-shell' for local commands. | 175 | "Use this switch together with `tramp-encoding-shell' for local commands. |
| 176 | See the variable `tramp-encoding-shell' for more information." | 176 | See the variable `tramp-encoding-shell' for more information." |
| 177 | :group 'tramp | 177 | :group 'tramp |
| 178 | :type 'string) | 178 | :type 'string) |
| 179 | 179 | ||
| 180 | (defcustom tramp-encoding-command-interactive | 180 | (defcustom tramp-encoding-command-interactive |
| 181 | (unless (string-match "cmd\\.exe" tramp-encoding-shell) "-i") | 181 | (unless (string-match "cmd\\.exe" tramp-encoding-shell) "-i") |
| 182 | "*Use this switch together with `tramp-encoding-shell' for interactive shells. | 182 | "Use this switch together with `tramp-encoding-shell' for interactive shells. |
| 183 | See the variable `tramp-encoding-shell' for more information." | 183 | See the variable `tramp-encoding-shell' for more information." |
| 184 | :version "24.1" | 184 | :version "24.1" |
| 185 | :group 'tramp | 185 | :group 'tramp |
| @@ -187,7 +187,7 @@ See the variable `tramp-encoding-shell' for more information." | |||
| 187 | 187 | ||
| 188 | ;;;###tramp-autoload | 188 | ;;;###tramp-autoload |
| 189 | (defvar tramp-methods nil | 189 | (defvar tramp-methods nil |
| 190 | "*Alist of methods for remote files. | 190 | "Alist of methods for remote files. |
| 191 | This is a list of entries of the form (NAME PARAM1 PARAM2 ...). | 191 | This is a list of entries of the form (NAME PARAM1 PARAM2 ...). |
| 192 | Each NAME stands for a remote access method. Each PARAM is a | 192 | Each NAME stands for a remote access method. Each PARAM is a |
| 193 | pair of the form (KEY VALUE). The following KEYs are defined: | 193 | pair of the form (KEY VALUE). The following KEYs are defined: |
| @@ -334,7 +334,7 @@ shouldn't return t when it isn't." | |||
| 334 | (t "ssh"))) | 334 | (t "ssh"))) |
| 335 | ;; Fallback. | 335 | ;; Fallback. |
| 336 | (t "ftp")) | 336 | (t "ftp")) |
| 337 | "*Default method to use for transferring files. | 337 | "Default method to use for transferring files. |
| 338 | See `tramp-methods' for possibilities. | 338 | See `tramp-methods' for possibilities. |
| 339 | Also see `tramp-default-method-alist'." | 339 | Also see `tramp-default-method-alist'." |
| 340 | :group 'tramp | 340 | :group 'tramp |
| @@ -342,7 +342,7 @@ Also see `tramp-default-method-alist'." | |||
| 342 | 342 | ||
| 343 | ;;;###tramp-autoload | 343 | ;;;###tramp-autoload |
| 344 | (defcustom tramp-default-method-alist nil | 344 | (defcustom tramp-default-method-alist nil |
| 345 | "*Default method to use for specific host/user pairs. | 345 | "Default method to use for specific host/user pairs. |
| 346 | This is an alist of items (HOST USER METHOD). The first matching item | 346 | This is an alist of items (HOST USER METHOD). The first matching item |
| 347 | specifies the method to use for a file name which does not specify a | 347 | specifies the method to use for a file name which does not specify a |
| 348 | method. HOST and USER are regular expressions or nil, which is | 348 | method. HOST and USER are regular expressions or nil, which is |
| @@ -359,7 +359,7 @@ See `tramp-methods' for a list of possibilities for METHOD." | |||
| 359 | (choice :tag "Method name" string (const nil))))) | 359 | (choice :tag "Method name" string (const nil))))) |
| 360 | 360 | ||
| 361 | (defcustom tramp-default-user nil | 361 | (defcustom tramp-default-user nil |
| 362 | "*Default user to use for transferring files. | 362 | "Default user to use for transferring files. |
| 363 | It is nil by default; otherwise settings in configuration files like | 363 | It is nil by default; otherwise settings in configuration files like |
| 364 | \"~/.ssh/config\" would be overwritten. Also see `tramp-default-user-alist'. | 364 | \"~/.ssh/config\" would be overwritten. Also see `tramp-default-user-alist'. |
| 365 | 365 | ||
| @@ -369,7 +369,7 @@ This variable is regarded as obsolete, and will be removed soon." | |||
| 369 | 369 | ||
| 370 | ;;;###tramp-autoload | 370 | ;;;###tramp-autoload |
| 371 | (defcustom tramp-default-user-alist nil | 371 | (defcustom tramp-default-user-alist nil |
| 372 | "*Default user to use for specific method/host pairs. | 372 | "Default user to use for specific method/host pairs. |
| 373 | This is an alist of items (METHOD HOST USER). The first matching item | 373 | This is an alist of items (METHOD HOST USER). The first matching item |
| 374 | specifies the user to use for a file name which does not specify a | 374 | specifies the user to use for a file name which does not specify a |
| 375 | user. METHOD and USER are regular expressions or nil, which is | 375 | user. METHOD and USER are regular expressions or nil, which is |
| @@ -384,13 +384,13 @@ empty string for the method name." | |||
| 384 | (choice :tag " User name" string (const nil))))) | 384 | (choice :tag " User name" string (const nil))))) |
| 385 | 385 | ||
| 386 | (defcustom tramp-default-host (system-name) | 386 | (defcustom tramp-default-host (system-name) |
| 387 | "*Default host to use for transferring files. | 387 | "Default host to use for transferring files. |
| 388 | Useful for su and sudo methods mostly." | 388 | Useful for su and sudo methods mostly." |
| 389 | :group 'tramp | 389 | :group 'tramp |
| 390 | :type 'string) | 390 | :type 'string) |
| 391 | 391 | ||
| 392 | (defcustom tramp-default-proxies-alist nil | 392 | (defcustom tramp-default-proxies-alist nil |
| 393 | "*Route to be followed for specific host/user pairs. | 393 | "Route to be followed for specific host/user pairs. |
| 394 | This is an alist of items (HOST USER PROXY). The first matching | 394 | This is an alist of items (HOST USER PROXY). The first matching |
| 395 | item specifies the proxy to be passed for a file name located on | 395 | item specifies the proxy to be passed for a file name located on |
| 396 | a remote target matching USER@HOST. HOST and USER are regular | 396 | a remote target matching USER@HOST. HOST and USER are regular |
| @@ -415,10 +415,10 @@ interpreted as a regular expression which always matches." | |||
| 415 | (regexp-opt | 415 | (regexp-opt |
| 416 | (list "localhost" "localhost6" (system-name) "127\.0\.0\.1" "::1") t) | 416 | (list "localhost" "localhost6" (system-name) "127\.0\.0\.1" "::1") t) |
| 417 | "\\'") | 417 | "\\'") |
| 418 | "*Host names which are regarded as local host.") | 418 | "Host names which are regarded as local host.") |
| 419 | 419 | ||
| 420 | (defvar tramp-completion-function-alist nil | 420 | (defvar tramp-completion-function-alist nil |
| 421 | "*Alist of methods for remote files. | 421 | "Alist of methods for remote files. |
| 422 | This is a list of entries of the form \(NAME PAIR1 PAIR2 ...\). | 422 | This is a list of entries of the form \(NAME PAIR1 PAIR2 ...\). |
| 423 | Each NAME stands for a remote access method. Each PAIR is of the form | 423 | Each NAME stands for a remote access method. Each PAIR is of the form |
| 424 | \(FUNCTION FILE\). FUNCTION is responsible to extract user names and host | 424 | \(FUNCTION FILE\). FUNCTION is responsible to extract user names and host |
| @@ -463,13 +463,13 @@ the remote shell.") | |||
| 463 | 463 | ||
| 464 | (defcustom tramp-local-end-of-line | 464 | (defcustom tramp-local-end-of-line |
| 465 | (if (memq system-type '(windows-nt)) "\r\n" "\n") | 465 | (if (memq system-type '(windows-nt)) "\r\n" "\n") |
| 466 | "*String used for end of line in local processes." | 466 | "String used for end of line in local processes." |
| 467 | :version "24.1" | 467 | :version "24.1" |
| 468 | :group 'tramp | 468 | :group 'tramp |
| 469 | :type 'string) | 469 | :type 'string) |
| 470 | 470 | ||
| 471 | (defcustom tramp-rsh-end-of-line "\n" | 471 | (defcustom tramp-rsh-end-of-line "\n" |
| 472 | "*String used for end of line in rsh connections. | 472 | "String used for end of line in rsh connections. |
| 473 | I don't think this ever needs to be changed, so please tell me about it | 473 | I don't think this ever needs to be changed, so please tell me about it |
| 474 | if you need to change this. | 474 | if you need to change this. |
| 475 | Also see the method parameter `tramp-password-end-of-line' and the normal | 475 | Also see the method parameter `tramp-password-end-of-line' and the normal |
| @@ -479,7 +479,7 @@ variable `tramp-default-password-end-of-line'." | |||
| 479 | 479 | ||
| 480 | (defcustom tramp-default-password-end-of-line | 480 | (defcustom tramp-default-password-end-of-line |
| 481 | tramp-rsh-end-of-line | 481 | tramp-rsh-end-of-line |
| 482 | "*String used for end of line after sending a password. | 482 | "String used for end of line after sending a password. |
| 483 | This variable provides the default value for the method parameter | 483 | This variable provides the default value for the method parameter |
| 484 | `tramp-password-end-of-line', see `tramp-methods' for more details. | 484 | `tramp-password-end-of-line', see `tramp-methods' for more details. |
| 485 | 485 | ||
| @@ -494,7 +494,7 @@ The default value is to use the same value as `tramp-rsh-end-of-line'." | |||
| 494 | 494 | ||
| 495 | (defcustom tramp-login-prompt-regexp | 495 | (defcustom tramp-login-prompt-regexp |
| 496 | ".*ogin\\( .*\\)?: *" | 496 | ".*ogin\\( .*\\)?: *" |
| 497 | "*Regexp matching login-like prompts. | 497 | "Regexp matching login-like prompts. |
| 498 | The regexp should match at end of buffer. | 498 | The regexp should match at end of buffer. |
| 499 | 499 | ||
| 500 | Sometimes the prompt is reported to look like \"login as:\"." | 500 | Sometimes the prompt is reported to look like \"login as:\"." |
| @@ -523,7 +523,7 @@ This regexp must match both `tramp-initial-end-of-output' and | |||
| 523 | 523 | ||
| 524 | (defcustom tramp-password-prompt-regexp | 524 | (defcustom tramp-password-prompt-regexp |
| 525 | "^.*\\([pP]assword\\|[pP]assphrase\\).*:\^@? *" | 525 | "^.*\\([pP]assword\\|[pP]assphrase\\).*:\^@? *" |
| 526 | "*Regexp matching password-like prompts. | 526 | "Regexp matching password-like prompts. |
| 527 | The regexp should match at end of buffer. | 527 | The regexp should match at end of buffer. |
| 528 | 528 | ||
| 529 | The `sudo' program appears to insert a `^@' character into the prompt." | 529 | The `sudo' program appears to insert a `^@' character into the prompt." |
| @@ -549,7 +549,7 @@ The `sudo' program appears to insert a `^@' character into the prompt." | |||
| 549 | ;; Here comes a list of regexes, separated by \\| | 549 | ;; Here comes a list of regexes, separated by \\| |
| 550 | "Received signal [0-9]+" | 550 | "Received signal [0-9]+" |
| 551 | "\\).*") | 551 | "\\).*") |
| 552 | "*Regexp matching a `login failed' message. | 552 | "Regexp matching a `login failed' message. |
| 553 | The regexp should match at end of buffer." | 553 | The regexp should match at end of buffer." |
| 554 | :group 'tramp | 554 | :group 'tramp |
| 555 | :type 'regexp) | 555 | :type 'regexp) |
| @@ -620,7 +620,7 @@ The answer will be provided by `tramp-action-process-alive', | |||
| 620 | :type 'regexp) | 620 | :type 'regexp) |
| 621 | 621 | ||
| 622 | (defconst tramp-temp-name-prefix "tramp." | 622 | (defconst tramp-temp-name-prefix "tramp." |
| 623 | "*Prefix to use for temporary files. | 623 | "Prefix to use for temporary files. |
| 624 | If this is a relative file name (such as \"tramp.\"), it is considered | 624 | If this is a relative file name (such as \"tramp.\"), it is considered |
| 625 | relative to the directory name returned by the function | 625 | relative to the directory name returned by the function |
| 626 | `tramp-compat-temporary-file-directory' (which see). It may also be an | 626 | `tramp-compat-temporary-file-directory' (which see). It may also be an |
| @@ -670,76 +670,76 @@ It can have the following values: | |||
| 670 | ((equal tramp-syntax 'sep) "/[") | 670 | ((equal tramp-syntax 'sep) "/[") |
| 671 | ((equal tramp-syntax 'url) "/") | 671 | ((equal tramp-syntax 'url) "/") |
| 672 | (t (error "Wrong `tramp-syntax' defined"))) | 672 | (t (error "Wrong `tramp-syntax' defined"))) |
| 673 | "*String matching the very beginning of Tramp file names. | 673 | "String matching the very beginning of Tramp file names. |
| 674 | Used in `tramp-make-tramp-file-name'.") | 674 | Used in `tramp-make-tramp-file-name'.") |
| 675 | 675 | ||
| 676 | (defconst tramp-prefix-regexp | 676 | (defconst tramp-prefix-regexp |
| 677 | (concat "^" (regexp-quote tramp-prefix-format)) | 677 | (concat "^" (regexp-quote tramp-prefix-format)) |
| 678 | "*Regexp matching the very beginning of Tramp file names. | 678 | "Regexp matching the very beginning of Tramp file names. |
| 679 | Should always start with \"^\". Derived from `tramp-prefix-format'.") | 679 | Should always start with \"^\". Derived from `tramp-prefix-format'.") |
| 680 | 680 | ||
| 681 | (defconst tramp-method-regexp | 681 | (defconst tramp-method-regexp |
| 682 | "[a-zA-Z_0-9-]+" | 682 | "[a-zA-Z_0-9-]+" |
| 683 | "*Regexp matching methods identifiers.") | 683 | "Regexp matching methods identifiers.") |
| 684 | 684 | ||
| 685 | (defconst tramp-postfix-method-format | 685 | (defconst tramp-postfix-method-format |
| 686 | (cond ((equal tramp-syntax 'ftp) ":") | 686 | (cond ((equal tramp-syntax 'ftp) ":") |
| 687 | ((equal tramp-syntax 'sep) "/") | 687 | ((equal tramp-syntax 'sep) "/") |
| 688 | ((equal tramp-syntax 'url) "://") | 688 | ((equal tramp-syntax 'url) "://") |
| 689 | (t (error "Wrong `tramp-syntax' defined"))) | 689 | (t (error "Wrong `tramp-syntax' defined"))) |
| 690 | "*String matching delimiter between method and user or host names. | 690 | "String matching delimiter between method and user or host names. |
| 691 | Used in `tramp-make-tramp-file-name'.") | 691 | Used in `tramp-make-tramp-file-name'.") |
| 692 | 692 | ||
| 693 | (defconst tramp-postfix-method-regexp | 693 | (defconst tramp-postfix-method-regexp |
| 694 | (regexp-quote tramp-postfix-method-format) | 694 | (regexp-quote tramp-postfix-method-format) |
| 695 | "*Regexp matching delimiter between method and user or host names. | 695 | "Regexp matching delimiter between method and user or host names. |
| 696 | Derived from `tramp-postfix-method-format'.") | 696 | Derived from `tramp-postfix-method-format'.") |
| 697 | 697 | ||
| 698 | (defconst tramp-user-regexp "[^:/ \t]+" | 698 | (defconst tramp-user-regexp "[^:/ \t]+" |
| 699 | "*Regexp matching user names.") | 699 | "Regexp matching user names.") |
| 700 | 700 | ||
| 701 | ;;;###tramp-autoload | 701 | ;;;###tramp-autoload |
| 702 | (defconst tramp-prefix-domain-format "%" | 702 | (defconst tramp-prefix-domain-format "%" |
| 703 | "*String matching delimiter between user and domain names.") | 703 | "String matching delimiter between user and domain names.") |
| 704 | 704 | ||
| 705 | ;;;###tramp-autoload | 705 | ;;;###tramp-autoload |
| 706 | (defconst tramp-prefix-domain-regexp | 706 | (defconst tramp-prefix-domain-regexp |
| 707 | (regexp-quote tramp-prefix-domain-format) | 707 | (regexp-quote tramp-prefix-domain-format) |
| 708 | "*Regexp matching delimiter between user and domain names. | 708 | "Regexp matching delimiter between user and domain names. |
| 709 | Derived from `tramp-prefix-domain-format'.") | 709 | Derived from `tramp-prefix-domain-format'.") |
| 710 | 710 | ||
| 711 | (defconst tramp-domain-regexp "[-a-zA-Z0-9_.]+" | 711 | (defconst tramp-domain-regexp "[-a-zA-Z0-9_.]+" |
| 712 | "*Regexp matching domain names.") | 712 | "Regexp matching domain names.") |
| 713 | 713 | ||
| 714 | (defconst tramp-user-with-domain-regexp | 714 | (defconst tramp-user-with-domain-regexp |
| 715 | (concat "\\(" tramp-user-regexp "\\)" | 715 | (concat "\\(" tramp-user-regexp "\\)" |
| 716 | tramp-prefix-domain-regexp | 716 | tramp-prefix-domain-regexp |
| 717 | "\\(" tramp-domain-regexp "\\)") | 717 | "\\(" tramp-domain-regexp "\\)") |
| 718 | "*Regexp matching user names with domain names.") | 718 | "Regexp matching user names with domain names.") |
| 719 | 719 | ||
| 720 | (defconst tramp-postfix-user-format "@" | 720 | (defconst tramp-postfix-user-format "@" |
| 721 | "*String matching delimiter between user and host names. | 721 | "String matching delimiter between user and host names. |
| 722 | Used in `tramp-make-tramp-file-name'.") | 722 | Used in `tramp-make-tramp-file-name'.") |
| 723 | 723 | ||
| 724 | (defconst tramp-postfix-user-regexp | 724 | (defconst tramp-postfix-user-regexp |
| 725 | (regexp-quote tramp-postfix-user-format) | 725 | (regexp-quote tramp-postfix-user-format) |
| 726 | "*Regexp matching delimiter between user and host names. | 726 | "Regexp matching delimiter between user and host names. |
| 727 | Derived from `tramp-postfix-user-format'.") | 727 | Derived from `tramp-postfix-user-format'.") |
| 728 | 728 | ||
| 729 | (defconst tramp-host-regexp "[a-zA-Z0-9_.-]+" | 729 | (defconst tramp-host-regexp "[a-zA-Z0-9_.-]+" |
| 730 | "*Regexp matching host names.") | 730 | "Regexp matching host names.") |
| 731 | 731 | ||
| 732 | (defconst tramp-prefix-ipv6-format | 732 | (defconst tramp-prefix-ipv6-format |
| 733 | (cond ((equal tramp-syntax 'ftp) "[") | 733 | (cond ((equal tramp-syntax 'ftp) "[") |
| 734 | ((equal tramp-syntax 'sep) "") | 734 | ((equal tramp-syntax 'sep) "") |
| 735 | ((equal tramp-syntax 'url) "[") | 735 | ((equal tramp-syntax 'url) "[") |
| 736 | (t (error "Wrong `tramp-syntax' defined"))) | 736 | (t (error "Wrong `tramp-syntax' defined"))) |
| 737 | "*String matching left hand side of IPv6 addresses. | 737 | "String matching left hand side of IPv6 addresses. |
| 738 | Used in `tramp-make-tramp-file-name'.") | 738 | Used in `tramp-make-tramp-file-name'.") |
| 739 | 739 | ||
| 740 | (defconst tramp-prefix-ipv6-regexp | 740 | (defconst tramp-prefix-ipv6-regexp |
| 741 | (regexp-quote tramp-prefix-ipv6-format) | 741 | (regexp-quote tramp-prefix-ipv6-format) |
| 742 | "*Regexp matching left hand side of IPv6 addresses. | 742 | "Regexp matching left hand side of IPv6 addresses. |
| 743 | Derived from `tramp-prefix-ipv6-format'.") | 743 | Derived from `tramp-prefix-ipv6-format'.") |
| 744 | 744 | ||
| 745 | ;; The following regexp is a bit sloppy. But it shall serve our | 745 | ;; The following regexp is a bit sloppy. But it shall serve our |
| @@ -747,19 +747,19 @@ Derived from `tramp-prefix-ipv6-format'.") | |||
| 747 | ;; "::ffff:192.168.0.1". | 747 | ;; "::ffff:192.168.0.1". |
| 748 | (defconst tramp-ipv6-regexp | 748 | (defconst tramp-ipv6-regexp |
| 749 | "\\(?:\\(?:[a-zA-Z0-9]+\\)?:\\)+[a-zA-Z0-9.]+" | 749 | "\\(?:\\(?:[a-zA-Z0-9]+\\)?:\\)+[a-zA-Z0-9.]+" |
| 750 | "*Regexp matching IPv6 addresses.") | 750 | "Regexp matching IPv6 addresses.") |
| 751 | 751 | ||
| 752 | (defconst tramp-postfix-ipv6-format | 752 | (defconst tramp-postfix-ipv6-format |
| 753 | (cond ((equal tramp-syntax 'ftp) "]") | 753 | (cond ((equal tramp-syntax 'ftp) "]") |
| 754 | ((equal tramp-syntax 'sep) "") | 754 | ((equal tramp-syntax 'sep) "") |
| 755 | ((equal tramp-syntax 'url) "]") | 755 | ((equal tramp-syntax 'url) "]") |
| 756 | (t (error "Wrong `tramp-syntax' defined"))) | 756 | (t (error "Wrong `tramp-syntax' defined"))) |
| 757 | "*String matching right hand side of IPv6 addresses. | 757 | "String matching right hand side of IPv6 addresses. |
| 758 | Used in `tramp-make-tramp-file-name'.") | 758 | Used in `tramp-make-tramp-file-name'.") |
| 759 | 759 | ||
| 760 | (defconst tramp-postfix-ipv6-regexp | 760 | (defconst tramp-postfix-ipv6-regexp |
| 761 | (regexp-quote tramp-postfix-ipv6-format) | 761 | (regexp-quote tramp-postfix-ipv6-format) |
| 762 | "*Regexp matching right hand side of IPv6 addresses. | 762 | "Regexp matching right hand side of IPv6 addresses. |
| 763 | Derived from `tramp-postfix-ipv6-format'.") | 763 | Derived from `tramp-postfix-ipv6-format'.") |
| 764 | 764 | ||
| 765 | (defconst tramp-prefix-port-format | 765 | (defconst tramp-prefix-port-format |
| @@ -767,37 +767,37 @@ Derived from `tramp-postfix-ipv6-format'.") | |||
| 767 | ((equal tramp-syntax 'sep) "#") | 767 | ((equal tramp-syntax 'sep) "#") |
| 768 | ((equal tramp-syntax 'url) ":") | 768 | ((equal tramp-syntax 'url) ":") |
| 769 | (t (error "Wrong `tramp-syntax' defined"))) | 769 | (t (error "Wrong `tramp-syntax' defined"))) |
| 770 | "*String matching delimiter between host names and port numbers.") | 770 | "String matching delimiter between host names and port numbers.") |
| 771 | 771 | ||
| 772 | (defconst tramp-prefix-port-regexp | 772 | (defconst tramp-prefix-port-regexp |
| 773 | (regexp-quote tramp-prefix-port-format) | 773 | (regexp-quote tramp-prefix-port-format) |
| 774 | "*Regexp matching delimiter between host names and port numbers. | 774 | "Regexp matching delimiter between host names and port numbers. |
| 775 | Derived from `tramp-prefix-port-format'.") | 775 | Derived from `tramp-prefix-port-format'.") |
| 776 | 776 | ||
| 777 | (defconst tramp-port-regexp "[0-9]+" | 777 | (defconst tramp-port-regexp "[0-9]+" |
| 778 | "*Regexp matching port numbers.") | 778 | "Regexp matching port numbers.") |
| 779 | 779 | ||
| 780 | (defconst tramp-host-with-port-regexp | 780 | (defconst tramp-host-with-port-regexp |
| 781 | (concat "\\(" tramp-host-regexp "\\)" | 781 | (concat "\\(" tramp-host-regexp "\\)" |
| 782 | tramp-prefix-port-regexp | 782 | tramp-prefix-port-regexp |
| 783 | "\\(" tramp-port-regexp "\\)") | 783 | "\\(" tramp-port-regexp "\\)") |
| 784 | "*Regexp matching host names with port numbers.") | 784 | "Regexp matching host names with port numbers.") |
| 785 | 785 | ||
| 786 | (defconst tramp-postfix-host-format | 786 | (defconst tramp-postfix-host-format |
| 787 | (cond ((equal tramp-syntax 'ftp) ":") | 787 | (cond ((equal tramp-syntax 'ftp) ":") |
| 788 | ((equal tramp-syntax 'sep) "]") | 788 | ((equal tramp-syntax 'sep) "]") |
| 789 | ((equal tramp-syntax 'url) "") | 789 | ((equal tramp-syntax 'url) "") |
| 790 | (t (error "Wrong `tramp-syntax' defined"))) | 790 | (t (error "Wrong `tramp-syntax' defined"))) |
| 791 | "*String matching delimiter between host names and localnames. | 791 | "String matching delimiter between host names and localnames. |
| 792 | Used in `tramp-make-tramp-file-name'.") | 792 | Used in `tramp-make-tramp-file-name'.") |
| 793 | 793 | ||
| 794 | (defconst tramp-postfix-host-regexp | 794 | (defconst tramp-postfix-host-regexp |
| 795 | (regexp-quote tramp-postfix-host-format) | 795 | (regexp-quote tramp-postfix-host-format) |
| 796 | "*Regexp matching delimiter between host names and localnames. | 796 | "Regexp matching delimiter between host names and localnames. |
| 797 | Derived from `tramp-postfix-host-format'.") | 797 | Derived from `tramp-postfix-host-format'.") |
| 798 | 798 | ||
| 799 | (defconst tramp-localname-regexp ".*$" | 799 | (defconst tramp-localname-regexp ".*$" |
| 800 | "*Regexp matching localnames.") | 800 | "Regexp matching localnames.") |
| 801 | 801 | ||
| 802 | ;;; File name format: | 802 | ;;; File name format: |
| 803 | 803 | ||
| @@ -816,7 +816,7 @@ Derived from `tramp-postfix-host-format'.") | |||
| 816 | "\\(" tramp-localname-regexp "\\)") | 816 | "\\(" tramp-localname-regexp "\\)") |
| 817 | 2 4 5 8) | 817 | 2 4 5 8) |
| 818 | 818 | ||
| 819 | "*List of five elements (REGEXP METHOD USER HOST FILE), detailing \ | 819 | "List of five elements (REGEXP METHOD USER HOST FILE), detailing \ |
| 820 | the Tramp file name structure. | 820 | the Tramp file name structure. |
| 821 | 821 | ||
| 822 | The first element REGEXP is a regular expression matching a Tramp file | 822 | The first element REGEXP is a regular expression matching a Tramp file |
| @@ -860,7 +860,7 @@ See `tramp-file-name-structure' for more explanations.") | |||
| 860 | ((equal tramp-syntax 'sep) tramp-file-name-regexp-separate) | 860 | ((equal tramp-syntax 'sep) tramp-file-name-regexp-separate) |
| 861 | ((equal tramp-syntax 'url) tramp-file-name-regexp-url) | 861 | ((equal tramp-syntax 'url) tramp-file-name-regexp-url) |
| 862 | (t (error "Wrong `tramp-syntax' defined"))) | 862 | (t (error "Wrong `tramp-syntax' defined"))) |
| 863 | "*Regular expression matching file names handled by Tramp. | 863 | "Regular expression matching file names handled by Tramp. |
| 864 | This regexp should match Tramp file names but no other file names. | 864 | This regexp should match Tramp file names but no other file names. |
| 865 | When tramp.el is loaded, this regular expression is prepended to | 865 | When tramp.el is loaded, this regular expression is prepended to |
| 866 | `file-name-handler-alist', and that is searched sequentially. Thus, | 866 | `file-name-handler-alist', and that is searched sequentially. Thus, |
| @@ -904,7 +904,7 @@ See `tramp-file-name-structure' for more explanations.") | |||
| 904 | ((equal tramp-syntax 'sep) tramp-completion-file-name-regexp-separate) | 904 | ((equal tramp-syntax 'sep) tramp-completion-file-name-regexp-separate) |
| 905 | ((equal tramp-syntax 'url) tramp-completion-file-name-regexp-url) | 905 | ((equal tramp-syntax 'url) tramp-completion-file-name-regexp-url) |
| 906 | (t (error "Wrong `tramp-syntax' defined"))) | 906 | (t (error "Wrong `tramp-syntax' defined"))) |
| 907 | "*Regular expression matching file names handled by Tramp completion. | 907 | "Regular expression matching file names handled by Tramp completion. |
| 908 | This regexp should match partial Tramp file names only. | 908 | This regexp should match partial Tramp file names only. |
| 909 | 909 | ||
| 910 | Please note that the entry in `file-name-handler-alist' is made when | 910 | Please note that the entry in `file-name-handler-alist' is made when |
| @@ -926,7 +926,7 @@ Also see `tramp-file-name-structure'.") | |||
| 926 | ;; Parentheses in docstring starting at beginning of line are escaped. | 926 | ;; Parentheses in docstring starting at beginning of line are escaped. |
| 927 | ;; Fontification is messed up when | 927 | ;; Fontification is messed up when |
| 928 | ;; `open-paren-in-column-0-is-defun-start' set to t. | 928 | ;; `open-paren-in-column-0-is-defun-start' set to t. |
| 929 | "*If non-nil, chunksize for sending input to local process. | 929 | "If non-nil, chunksize for sending input to local process. |
| 930 | It is necessary only on systems which have a buggy `process-send-string' | 930 | It is necessary only on systems which have a buggy `process-send-string' |
| 931 | implementation. The necessity, whether this variable must be set, can be | 931 | implementation. The necessity, whether this variable must be set, can be |
| 932 | checked via the following code: | 932 | checked via the following code: |
diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el index 4b8fbe1e2cf..232e5ca581a 100644 --- a/lisp/net/webjump.el +++ b/lisp/net/webjump.el | |||
| @@ -276,7 +276,7 @@ function and the `webjump-sites' variable.") | |||
| 276 | 276 | ||
| 277 | (defvar webjump-sites | 277 | (defvar webjump-sites |
| 278 | webjump-sample-sites | 278 | webjump-sample-sites |
| 279 | "*Hotlist for WebJump. | 279 | "Hotlist for WebJump. |
| 280 | 280 | ||
| 281 | The hotlist is represented as an association list, with the CAR of each cell | 281 | The hotlist is represented as an association list, with the CAR of each cell |
| 282 | being the name of the Web site, and the CDR being the definition for the URL of | 282 | being the name of the Web site, and the CDR being the definition for the URL of |