--- a/lisp/w3/url-gw.el	Mon Aug 13 09:26:04 2007 +0200
+++ b/lisp/w3/url-gw.el	Mon Aug 13 09:26:39 2007 +0200
@@ -1,7 +1,7 @@
 ;;; url-gw.el --- Gateway munging for URL loading
 ;; Author: wmperry
-;; Created: 1997/03/27 21:29:24
-;; Version: 1.8
+;; Created: 1997/04/11 14:39:18
+;; Version: 1.9
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -26,50 +26,80 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (require 'cl)
 
-(defvar url-gateway-local-host-regexp nil
-  "*A regular expression specifying local hostnames/machines.")
+(defgroup url-gateway nil
+  "URL gateway variables"
+  :group 'url)
 
-(defvar url-gateway-prompt-pattern
+(defcustom url-gateway-local-host-regexp nil
+  "*A regular expression specifying local hostnames/machines."
+  :type '(choice (const nil) regexp)
+  :group 'url-gateway)
+
+(defcustom url-gateway-prompt-pattern
   "^[^#$%>;]*[#$%>;] *" ;; "bash\\|\$ *\r?$\\|> *\r?"
-  "*A regular expression matching a shell prompt.")
+  "*A regular expression matching a shell prompt."
+  :type 'regexp
+  :group 'url-gateway)
 
-(defvar url-gateway-rlogin-host nil
-  "*What hostname to actually rlog into before doing a telnet.")
+(defcustom url-gateway-rlogin-host nil
+  "*What hostname to actually rlog into before doing a telnet."
+  :type '(choice (const nil) string)
+  :group 'url-gateway)
 
-(defvar url-gateway-rlogin-user-name nil
-  "*Username to log into the remote machine with when using rlogin.")
+(defcustom url-gateway-rlogin-user-name nil
+  "*Username to log into the remote machine with when using rlogin."
+  :type '(choice (const nil) string)
+  :group 'url-gateway)
 
-(defvar url-gateway-rlogin-parameters '("telnet" "-8")
+(defcustom url-gateway-rlogin-parameters '("telnet" "-8")
   "*Parameters to `url-open-rlogin'.
-This list will be used as the parameter list given to rsh.")
+This list will be used as the parameter list given to rsh."
+  :type '(repeat string)
+  :group 'url-gateway)
 
-(defvar url-gateway-telnet-host nil
-  "*What hostname to actually login to before doing a telnet.")
+(defcustom url-gateway-telnet-host nil
+  "*What hostname to actually login to before doing a telnet."
+  :type '(choice (const nil) string)
+  :group 'url-gateway)
 
-(defvar url-gateway-telnet-parameters '("exec" "telnet" "-8")
+(defcustom url-gateway-telnet-parameters '("exec" "telnet" "-8")
   "*Parameters to `url-open-telnet'.
-This list will be executed as a command after logging in via telnet.")
+This list will be executed as a command after logging in via telnet."
+  :type '(repeat string)
+  :group 'url-gateway)
 
-(defvar url-gateway-telnet-login-prompt "^\r*.?login:"
-  "*Prompt that tells us we should send our username when loggin in w/telnet.")
+(defcustom url-gateway-telnet-login-prompt "^\r*.?login:"
+  "*Prompt that tells us we should send our username when loggin in w/telnet."
+  :type 'regexp
+  :group 'url-gateway)
 
-(defvar url-gateway-telnet-password-prompt "^\r*.?password:"
-  "*Prompt that tells us we should send our password when loggin in w/telnet.")
+(defcustom url-gateway-telnet-password-prompt "^\r*.?password:"
+  "*Prompt that tells us we should send our password when loggin in w/telnet."
+  :type 'regexp
+  :group 'url-gateway)
 
-(defvar url-gateway-telnet-user-name nil
-  "User name to log in via telnet with.")
+(defcustom url-gateway-telnet-user-name nil
+  "User name to log in via telnet with."
+  :type '(choice (const nil) string)
+  :group 'url-gateway)
 
-(defvar url-gateway-telnet-password nil
-  "Password to use to log in via telnet with.")
+(defcustom url-gateway-telnet-password nil
+  "Password to use to log in via telnet with."
+  :type '(choice (const nil) string)
+  :group 'url-gateway)
 
-(defvar url-gateway-broken-resolution nil
+(defcustom url-gateway-broken-resolution nil
   "*Whether to use nslookup to resolve hostnames.
 This should be used when your version of Emacs cannot correctly use DNS,
 but your machine can.  This usually happens if you are running a statically
-linked Emacs under SunOS 4.x")
+linked Emacs under SunOS 4.x"
+  :type 'boolean
+  :group 'url-gateway)
 
-(defvar url-gateway-nslookup-program "nslookup"
-  "*If non-NIL then a string naming nslookup program." )
+(defcustom url-gateway-nslookup-program "nslookup"
+  "*If non-NIL then a string naming nslookup program."
+  :type '(choice (const :tag "None" :value nil) string)
+  :group 'url-gateway)
 
 ;; Stolen from ange-ftp
 ;;;###autoload