Mercurial > emacs

comparison lisp/net/tramp.el @ 111779:141d3f14d8c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge changes from emacs-23 branch
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 27 Nov 2010 15:04:57 -0500
parents daaca509a6d8 202eb704e80b
children 8e746f396237
comparison
equal deleted inserted replaced
111742:f026c8607795 111779:141d3f14d8c3
329 If the file name does not specify the user, lookup is done using the 329 If the file name does not specify the user, lookup is done using the
330 empty string for the user name. 330 empty string for the user name.
331 331
332 See `tramp-methods' for a list of possibilities for METHOD." 332 See `tramp-methods' for a list of possibilities for METHOD."
333 :group 'tramp 333 :group 'tramp
334 :type '(repeat (list (regexp :tag "Host regexp") 334 :type '(repeat (list (choice :tag "Host regexp" regexp sexp)
335 (regexp :tag "User regexp") 335 (choice :tag "User regexp" regexp sexp)
336 (string :tag "Method")))) 336 (choice :tag "Method name" string (const nil)))))
337 337
338 (defcustom tramp-default-user nil 338 (defcustom tramp-default-user nil
339 "*Default user to use for transferring files. 339 "*Default user to use for transferring files.
340 It is nil by default; otherwise settings in configuration files like 340 It is nil by default; otherwise settings in configuration files like
341 \"~/.ssh/config\" would be overwritten. Also see `tramp-default-user-alist'. 341 \"~/.ssh/config\" would be overwritten. Also see `tramp-default-user-alist'.
353 matches, the variable `tramp-default-user' takes effect. 353 matches, the variable `tramp-default-user' takes effect.
354 354
355 If the file name does not specify the method, lookup is done using the 355 If the file name does not specify the method, lookup is done using the
356 empty string for the method name." 356 empty string for the method name."
357 :group 'tramp 357 :group 'tramp
358 :type '(repeat (list (regexp :tag "Method regexp") 358 :type '(repeat (list (choice :tag "Method regexp" regexp sexp)
359 (regexp :tag "Host regexp") 359 (choice :tag " Host regexp" regexp sexp)
360 (string :tag "User")))) 360 (choice :tag " User name" string (const nil)))))
361 361
362 (defcustom tramp-default-host (system-name) 362 (defcustom tramp-default-host (system-name)
363 "*Default host to use for transferring files. 363 "*Default host to use for transferring files.
364 Useful for su and sudo methods mostly." 364 Useful for su and sudo methods mostly."
365 :group 'tramp 365 :group 'tramp
380 evaluated. The result must be a string or nil, which is 380 evaluated. The result must be a string or nil, which is
381 interpreted as a regular expression which always matches." 381 interpreted as a regular expression which always matches."
382 :group 'tramp 382 :group 'tramp
383 :type '(repeat (list (choice :tag "Host regexp" regexp sexp) 383 :type '(repeat (list (choice :tag "Host regexp" regexp sexp)
384 (choice :tag "User regexp" regexp sexp) 384 (choice :tag "User regexp" regexp sexp)
385 (choice :tag "Proxy remote name" string (const nil))))) 385 (choice :tag " Proxy name" string (const nil)))))
386 386
387 (defconst tramp-local-host-regexp 387 (defconst tramp-local-host-regexp
388 (concat 388 (concat
389 "^" (regexp-opt (list "localhost" (system-name) "127\.0\.0\.1" "::1") t) "$") 389 "^" (regexp-opt (list "localhost" (system-name) "127\.0\.0\.1" "::1") t) "$")
390 "*Host names which are regarded as local host.") 390 "*Host names which are regarded as local host.")