Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-62

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-616
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-620
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-621
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-622
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-625
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-626
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-627
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-628
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-629
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-630
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-631
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-632
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-633
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-51
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-52
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-53
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-54
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-55
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-56
   Update from CVS: Add lisp/legacy-gnus-agent.el

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-57
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-58
   Update from CVS

19 files changed, 782 insertions, 265 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 91a6c869a21..053984fcaeb 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,62 @@
+2004-10-20  John Paul Wallington  <jpw@gnu.org>
+
+        * url-gw.el (url-gateway-nslookup-host):
+        Use `set-process-query-on-exit-flag'.
+
+2004-10-10  Lars Hansen  <larsh@math.ku.dk>
+
+        * url-auth.el: Update header and footer.
+
+        * url-cache.el: Update header and footer.
+
+        * url-cid.el: Update header and footer.
+
+        * url-dired.el: Update header and footer.
+
+        * url-expand.el: Update header and footer.
+
+        * url-ftp.el: Update header and footer.
+
+        * url-gw.el: Update header and footer.
+
+        * url-imap.el: Update header and footer.
+
+        * url-irc.el: Update header and footer.
+
+        * url-misc.el: Update header and footer.
+
+        * url-news.el: Update header and footer.
+
+        * url-ns.el: Update header and footer.
+
+        * url-privacy.el: Update header and footer.
+
+        * url-proxy.el: Update header and footer.
+
+        * url-vars.el: Update header.
+
+2004-10-16  Richard M. Stallman  <rms@gnu.org>
+
+        * url.el (url-do-setup): Don't set url-passwd-entry-func.
+
+        * url-vars.el (url-passwd-entry-func): Var deleted.
+        (mm-mime-mule-charset-alist): Remove compatibility code for old Gnus.
+        (url-weekday-alist): Renamed from weekday-alist.
+        (url-monthabbrev-alist): Renamed from monthabbrev-alist.
+        (url-vars-unload-hook): Initialize hook var to hold the function.
+
+        * url-util.el (url-get-normalized-date): Use
+        url-weekday-alist and url-monthabbrev-alist.
+
+        * url-misc.el: Load cl at compile time.
+
+        * url-mailto.el: Don't load cl.
+        (url-mailto): Fix call to `push'.
+
+        * url-gw.el (url-open-telnet): Use read-passwd.
+
+        * url-auth.el (url-basic-auth, url-digest-auth): Use read-passwd.
+
 2004-10-12  Simon Josefsson  <jas@extundo.com>
 
         * url-vars.el (url-gateway-method): Add new method `tls'.
diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index 39bb730bebc..260315c5d54 100644
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -1,26 +1,27 @@
 ;;; url-auth.el --- Uniform Resource Locator authorization modules
+
+;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
+
 ;; Keywords: comm, data, processes, hypermedia
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Emacs.
-;;;
-;;; GNU Emacs is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Emacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;;; Boston, MA 02111-1307, USA.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Code:
 
 (require 'url-vars)
 (require 'url-parse)
@@ -78,7 +79,7 @@ instead of the pathname inheritance method."
      ((and prompt (not byserv))
       (setq user (read-string (url-auth-user-prompt url realm)
                               (user-real-login-name))
-            pass (funcall url-passwd-entry-func "Password: "))
+            pass (read-passwd "Password: "))
       (set url-basic-auth-storage
            (cons (list server
                        (cons path
@@ -102,7 +103,7 @@ instead of the pathname inheritance method."
           (progn
             (setq user (read-string (url-auth-user-prompt url realm)
                                     (user-real-login-name))
-                  pass (funcall url-passwd-entry-func "Password: ")
+                  pass (read-passwd "Password: ")
                   retval (base64-encode-string (format "%s:%s" user pass))
                   byserv (assoc server (symbol-value url-basic-auth-storage)))
             (setcdr byserv
@@ -160,7 +161,7 @@ instead of hostname:portnum."
          ((and prompt (not byserv))
           (setq user (read-string (url-auth-user-prompt url realm)
                                   (user-real-login-name))
-                pass (funcall url-passwd-entry-func "Password: ")
+                pass (read-passwd "Password: ")
                 url-digest-auth-storage
                 (cons (list server
                             (cons path
@@ -187,7 +188,7 @@ instead of hostname:portnum."
               (progn
                 (setq user (read-string (url-auth-user-prompt url realm)
                                         (user-real-login-name))
-                      pass (funcall url-passwd-entry-func "Password: ")
+                      pass (read-passwd "Password: ")
                       retval (setq retval
                                    (cons user
                                          (url-digest-auth-create-key
@@ -314,3 +315,4 @@ RATING   a rating between 1 and 10 of the strength of the authentication.
 (provide 'url-auth)
 
 ;;; arch-tag: 04058625-616d-44e4-9dbf-4b46b00b2a91
+;;; url-auth.el ends here
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index 1e3374639e1..f27b47251e4 100644
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -1,26 +1,28 @@
 ;;; url-cache.el --- Uniform Resource Locator retrieval tool
+
+;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
+
 ;; Keywords: comm, data, processes, hypermedia
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Emacs.
-;;;
-;;; GNU Emacs is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Emacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;;; Boston, MA 02111-1307, USA.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Code:
+
 (require 'url-parse)
 (require 'url-util)
 
@@ -200,3 +202,4 @@ Very fast if you have an `md5' primitive function, suitably fast otherwise."
 (provide 'url-cache)
 
 ;;; arch-tag: 95b050a6-8e81-4f23-8e63-191b9d1d657c
+;;; url-cache.el ends here
diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el
new file mode 100644
index 00000000000..9c44835ca9f
--- /dev/null
+++ b/lisp/url/url-cid.el
@@ -0,0 +1,66 @@
+;;; url-cid.el --- Content-ID URL loader
+
+;; Copyright (c) 1998 - 1999 Free Software Foundation, Inc.
+
+;; Keywords: comm, data, processes
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Code:
+
+(require 'url-vars)
+(require 'url-parse)
+
+(require 'mm-decode)
+
+(defun url-cid-gnus (cid)
+  (let ((content-type nil)
+        (encoding nil)
+        (part nil)
+        (data nil))
+    (setq part (mm-get-content-id cid))
+    (if (not part)
+        (message "Unknown CID encountered: %s" cid)
+      (setq data (save-excursion
+                   (set-buffer (mm-handle-buffer part))
+                   (buffer-string))
+            content-type (mm-handle-type part)
+            encoding (symbol-name (mm-handle-encoding part)))
+      (if (= 0 (length content-type)) (setq content-type "text/plain"))
+      (if (= 0 (length encoding)) (setq encoding "8bit"))
+      (if (listp content-type)
+          (setq content-type (car content-type)))
+      (insert (format "Content-type: %d\r\n"  (length data))
+              "Content-type: " content-type "\r\n"
+              "Content-transfer-encoding: " encoding "\r\n"
+              "\r\n"
+              (or data "")))))
+
+;;;###autoload
+(defun url-cid (url)
+  (cond
+   ((fboundp 'mm-get-content-id)
+    ;; Using Pterodactyl Gnus or later
+    (save-excursion
+      (set-buffer (generate-new-buffer " *url-cid*"))
+      (url-cid-gnus (url-filename url))))
+   (t
+    (message "Unable to handle CID URL: %s" url))))
+
+;;; arch-tag: 23d9ab74-fad4-4dba-b1e7-292871e8bda5
+;;; url-cid.el ends here
diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el
index 73307412e1e..41d81df677e 100644
--- a/lisp/url/url-dired.el
+++ b/lisp/url/url-dired.el
@@ -1,26 +1,27 @@
 ;;; url-dired.el --- URL Dired minor mode
+
+;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
+
 ;; Keywords: comm, files
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Emacs.
-;;;
-;;; GNU Emacs is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Emacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;;; Boston, MA 02111-1307, USA.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Code:
 
 (autoload 'w3-fetch "w3")
 (autoload 'w3-open-local "w3")
@@ -98,3 +99,4 @@ Example:  (add-minor-mode 'view-minor-mode \" View\" view-mode-map)"
 (provide 'url-dired)
 
 ;;; arch-tag: 2694f21a-43e1-4391-b3cb-cf6e5349f15f
+;;; url-dired.el ends here
diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el
new file mode 100644
index 00000000000..a7855653103
--- /dev/null
+++ b/lisp/url/url-expand.el
@@ -0,0 +1,144 @@
+;;; url-expand.el --- expand-file-name for URLs
+
+;; Copyright (c) 1999 Free Software Foundation, Inc.
+
+;; Keywords: comm, data, processes
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Code:
+
+(require 'url-methods)
+(require 'url-util)
+(require 'url-parse)
+
+(defun url-expander-remove-relative-links (name)
+  ;; Strip . and .. from pathnames
+  (let ((new (if (not (string-match "^/" name))
+                 (concat "/" name)
+               name)))
+
+    ;; If it ends with a '/.' or '/..', tack on a trailing '/' sot hat
+    ;; the tests that follow are not too complicated in terms of
+    ;; looking for '..' or '../', etc.
+    (if (string-match "/\\.+$" new)
+        (setq new (concat new "/")))
+
+    ;; Remove '/./' first
+    (while (string-match "/\\(\\./\\)" new)
+      (setq new (concat (substring new 0 (match-beginning 1))
+                        (substring new (match-end 1)))))
+
+    ;; Then remove '/../'
+    (while (string-match "/\\([^/]*/\\.\\./\\)" new)
+      (setq new (concat (substring new 0 (match-beginning 1))
+                        (substring new (match-end 1)))))
+
+    ;; Remove cruft at the beginning of the string, so people that put
+    ;; in extraneous '..' because they are morons won't lose.
+    (while (string-match "^/\\.\\.\\(/\\)" new)
+      (setq new (substring new (match-beginning 1) nil)))
+    new))
+
+(defun url-expand-file-name (url &optional default)
+  "Convert URL to a fully specified URL, and canonicalize it.
+Second arg DEFAULT is a URL to start with if URL is relative.
+If DEFAULT is nil or missing, the current buffer's URL is used.
+Path components that are `.' are removed, and 
+path components followed by `..' are removed, along with the `..' itself."
+  (if (and url (not (string-match "^#" url)))
+      ;; Need to nuke newlines and spaces in the URL, or we open
+      ;; ourselves up to potential security holes.
+      (setq url (mapconcat (function (lambda (x)
+                                       (if (memq x '(?  ?\n ?\r))
+                                           ""
+                                         (char-to-string x))))
+                           url "")))
+
+  ;; Need to figure out how/where to expand the fragment relative to
+  (setq default (cond
+                 ((vectorp default)
+                  ;; Default URL has already been parsed
+                  default)
+                 (default
+                   ;; They gave us a default URL in non-parsed format
+                   (url-generic-parse-url default))
+                 (url-current-object
+                  ;; We are in a URL-based buffer, use the pre-parsed object
+                  url-current-object)
+                 ((string-match url-nonrelative-link url)
+                  ;; The URL they gave us is absolute, go for it.
+                  nil)
+                 (t
+                  ;; Hmmm - this shouldn't ever happen.
+                  (error "url-expand-file-name confused - no default?"))))
+
+  (cond
+   ((= (length url) 0)                  ; nil or empty string
+    (url-recreate-url default))
+   ((string-match "^#" url)             ; Offset link, use it raw
+    url)
+   ((string-match url-nonrelative-link url) ; Fully-qualified URL, return it immediately
+    url)
+   (t
+    (let* ((urlobj (url-generic-parse-url url))
+           (inhibit-file-name-handlers t)
+           (expander (url-scheme-get-property (url-type default) 'expand-file-name)))
+      (if (string-match "^//" url)
+          (setq urlobj (url-generic-parse-url (concat (url-type default) ":"
+                                                      url))))
+      (funcall expander urlobj default)
+      (url-recreate-url urlobj)))))
+
+(defun url-identity-expander (urlobj defobj)
+  (url-set-type urlobj (or (url-type urlobj) (url-type defobj))))
+
+(defun url-default-expander (urlobj defobj)
+  ;; The default expansion routine - urlobj is modified by side effect!
+  (if (url-type urlobj)
+      ;; Well, they told us the scheme, let's just go with it.
+      nil
+    (url-set-type urlobj (or (url-type urlobj) (url-type defobj)))
+    (url-set-port urlobj (or (url-port urlobj)
+                             (and (string= (url-type urlobj)
+                                           (url-type defobj))
+                                  (url-port defobj))))
+    (if (not (string= "file" (url-type urlobj)))
+        (url-set-host urlobj (or (url-host urlobj) (url-host defobj))))
+    (if (string= "ftp"  (url-type urlobj))
+        (url-set-user urlobj (or (url-user urlobj) (url-user defobj))))
+    (if (string= (url-filename urlobj) "")
+        (url-set-filename urlobj "/"))
+    (if (string-match "^/" (url-filename urlobj))
+        nil
+      (let ((query nil)
+            (file nil)
+            (sepchar nil))
+        (if (string-match "[?#]" (url-filename urlobj))
+            (setq query (substring (url-filename urlobj) (match-end 0))
+                  file (substring (url-filename urlobj) 0 (match-beginning 0))
+                  sepchar (substring (url-filename urlobj) (match-beginning 0) (match-end 0)))
+          (setq file (url-filename urlobj)))
+        (setq file (url-expander-remove-relative-links
+                    (concat (url-basepath (url-filename defobj)) file)))
+        (url-set-filename urlobj (if query (concat file sepchar query) file))))))
+
+(provide 'url-expand)
+
+;;; arch-tag: 7b5f744b-b721-49da-be47-484631680a5a
+;;; url-expand.el ends here
diff --git a/lisp/url/url-ftp.el b/lisp/url/url-ftp.el
index 4346f3910b1..7f9c9de608d 100644
--- a/lisp/url/url-ftp.el
+++ b/lisp/url/url-ftp.el
@@ -1,26 +1,27 @@
 ;;; url-ftp.el --- FTP wrapper
+
+;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
+
 ;; Keywords: comm, data, processes
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Emacs.
-;;;
-;;; GNU Emacs is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Emacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;;; Boston, MA 02111-1307, USA.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
 
 ;; We knew not what we did when we overloaded 'file' to mean 'file'
 ;; and 'ftp' back in the dark ages of the web.
@@ -29,6 +30,8 @@
 ;; in url-methods.el and just maps everything onto the code in
 ;; url-file.
 
+;;; Code:
+
 (require 'url-parse)
 (require 'url-file)
 
@@ -40,3 +43,4 @@
 (provide 'url-ftp)
 
 ;;; arch-tag: 9c3e70c4-350f-4d4a-bb51-a1e9b459e7dc
+;;; url-ftp.el ends here
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index 608827d7cee..b5701668f83 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -1,27 +1,29 @@
 ;;; url-gw.el --- Gateway munging for URL loading
+
+;; Copyright (c) 1997, 1998, 2004 Free Software Foundation, Inc.
+
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1997, 1998, 2004 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Emacs.
-;;;
-;;; GNU Emacs is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Emacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;;; Boston, MA 02111-1307, USA.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Code:
+
 (eval-when-compile (require 'cl))
 (require 'url-vars)
 
@@ -115,7 +117,7 @@ linked Emacs under SunOS 4.x"
       (let ((proc (start-process " *nslookup*" " *nslookup*"
                                  url-gateway-nslookup-program host))
             (res host))
-        (process-kill-without-query proc)
+        (set-process-query-on-exit-flag proc nil)
         (save-excursion
           (set-buffer (process-buffer proc))
           (while (memq (process-status proc) '(run open))
@@ -186,7 +188,7 @@ linked Emacs under SunOS 4.x"
          proc (concat
                (or url-gateway-telnet-password
                    (setq url-gateway-telnet-password
-                         (funcall url-passwd-entry-func "Password: ")))
+                         (read-passwd "Password: ")))
                "\n"))
         (erase-buffer)
         (url-wait-for-string url-gateway-prompt-pattern proc)
@@ -266,3 +268,4 @@ Will not make a connexion if `url-gateway-unplugged' is non-nil."
 (provide 'url-gw)
 
 ;;; arch-tag: 1c4c0317-6d03-45b8-b3f3-838bd8f9d838
+;;; url-gw.el ends here
diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el
new file mode 100644
index 00000000000..79b53e5d012
--- /dev/null
+++ b/lisp/url/url-imap.el
@@ -0,0 +1,85 @@
+;;; url-imap.el --- IMAP retrieval routines
+
+;; Copyright (c) 1999 Free Software Foundation, Inc.
+
+;; Author: Simon Josefsson <jas@pdc.kth.se>
+;; Keywords: comm, data, processes
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; Anyway, here's a teaser. It's quite broken in lots of regards, but at
+;; least it seem to work. At least a little. At least when called
+;; manually like this (I've no idea how it's supposed to be called):
+
+;; (url-imap (url-generic-parse-url "imap://cyrus.andrew.cmu.edu/archive.c-client;UID=1021"))
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+(require 'url-util)
+(require 'url-parse)
+(require 'nnimap)
+(require 'mm-util)
+
+(defconst url-imap-default-port 143 "Default IMAP port")
+
+(defun url-imap-open-host (host port user pass)
+  ;; xxx use user and password
+  (if (fboundp 'nnheader-init-server-buffer)
+      (nnheader-init-server-buffer))
+  (let ((imap-username user)
+        (imap-password pass)
+        (authenticator (if user 'login 'anonymous)))
+    (if (stringp port)
+        (setq port (string-to-int port)))
+    (nnimap-open-server host
+                        `((nnimap-server-port ,port)
+                          (nnimap-stream 'network)
+                          (nnimap-authenticator ,authenticator)))))
+
+(defun url-imap (url)
+  (check-type url vector "Need a pre-parsed URL.")
+  (save-excursion
+    (set-buffer (generate-new-buffer " *url-imap*"))
+    (mm-disable-multibyte)
+    (let* ((host (url-host url))
+           (port (url-port url))
+           ;; xxx decode mailbox (see rfc2192)
+           (mailbox (url-filename url))
+           (coding-system-for-read 'binary))
+      (and (eq (string-to-char mailbox) ?/)
+           (setq mailbox (substring mailbox 1)))
+      (url-imap-open-host host port (url-user url) (url-password url))
+      (cond ((assoc "TYPE" (url-attributes url))
+             ;; xxx list mailboxes (start gnus?)
+             )
+            ((assoc "UID" (url-attributes url))
+             ;; fetch message part
+             ;; xxx handle partial fetches
+             (insert "Content-type: message/rfc822\n\n")
+             (nnimap-request-article (cdr (assoc "UID" (url-attributes url))) 
+                                     mailbox host (current-buffer)))
+            (t
+             ;; xxx list messages in mailbox (start gnus?)
+             )))
+    (current-buffer)))
+
+;;; arch-tag: 034991ff-5425-48ea-b911-c96c90e6f47d
+;;; url-imap.el ends here
diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el
index a4b195f253f..8b54b6d9222 100644
--- a/lisp/url/url-irc.el
+++ b/lisp/url/url-irc.el
@@ -1,28 +1,31 @@
 ;;; url-irc.el --- IRC URL interface
+
+;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
+
 ;; Keywords: comm, data, processes
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Emacs.
-;;;
-;;; GNU Emacs is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Emacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;;; Boston, MA 02111-1307, USA.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; IRC URLs are defined in http://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt
 
-;;; IRC URLs are defined in http://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt
+;;; Code:
 
 (require 'url-vars)
 (require 'url-parse)
@@ -74,3 +77,4 @@ PASSWORD - What password to use"
 (provide 'url-irc)
 
 ;;; arch-tag: 2e5eecf8-9eb3-436b-9fbd-c26f2fb2bf3e
+;;; url-irc.el ends here
diff --git a/lisp/url/url-mailto.el b/lisp/url/url-mailto.el
index bcb6bad4179..f5192bcb03f 100644
--- a/lisp/url/url-mailto.el
+++ b/lisp/url/url-mailto.el
@@ -25,7 +25,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
 (require 'url-vars)
 (require 'url-parse)
 (require 'url-util)
@@ -85,7 +84,7 @@
         (setq args (cons (list "x-url-from" source-url) args)))
 
     (if (assoc "to" args)
-        (push to (cdr (assoc "to" args)))
+        (push (cdr (assoc "to" args)) to)
       (setq args (cons (list "to" to) args)))
     (setq subject (cdr-safe (assoc "subject" args)))
     (if (fboundp url-mail-command) (funcall url-mail-command) (mail))
diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el
index ff2f1282137..21d42820e1b 100644
--- a/lisp/url/url-misc.el
+++ b/lisp/url/url-misc.el
@@ -1,27 +1,29 @@
 ;;; url-misc.el --- Misc Uniform Resource Locator retrieval code
+
+;; Copyright (c) 1996,1997,1998,1999,2002 Free Software Foundation, Inc.
+
 ;; Keywords: comm, data, processes
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1996,1997,1998,1999,2002 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Emacs.
-;;;
-;;; GNU Emacs is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Emacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;;; Boston, MA 02111-1307, USA.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Code:
 
+(eval-when-compile (require 'cl))
 (require 'url-vars)
 (require 'url-parse)
 (autoload 'Info-goto-node "info" "" t)
@@ -115,3 +117,4 @@
 (provide 'url-misc)
 
 ;;; arch-tag: 8c544e1b-d8bc-40a6-b319-f1f37fef65a0
+;;; url-misc.el ends here
diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el
index 59364c9ccd0..432c81f5d44 100644
--- a/lisp/url/url-news.el
+++ b/lisp/url/url-news.el
@@ -1,26 +1,28 @@
 ;;; url-news.el --- News Uniform Resource Locator retrieval code
+
+;; Copyright (c) 1996 - 1999, 2004 Free Software Foundation, Inc.
+
 ;; Keywords: comm, data, processes
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1996 - 1999, 2004 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Emacs.
-;;;
-;;; GNU Emacs is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Emacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;;; Boston, MA 02111-1307, USA.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Code:
+
 (require 'url-vars)
 (require 'url-util)
 (require 'url-parse)
@@ -133,3 +135,4 @@
 (provide 'url-news)
 
 ;;; arch-tag: 8975be13-04e8-4d38-bfff-47918e3ad311
+;;; url-news.el ends here
diff --git a/lisp/url/url-ns.el b/lisp/url/url-ns.el
new file mode 100644
index 00000000000..fe181422e4f
--- /dev/null
+++ b/lisp/url/url-ns.el
@@ -0,0 +1,107 @@
+;;; url-ns.el --- Various netscape-ish functions for proxy definitions
+
+;; Copyright (c) 1997 - 1999 Free Software Foundation, Inc.
+
+;; Keywords: comm, data, processes, hypermedia
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Code:
+
+(require 'url-gw)
+
+;;;###autoload
+(defun isPlainHostName (host)
+  (not (string-match "\\." host)))
+
+;;;###autoload
+(defun dnsDomainIs (host dom)
+  (string-match (concat (regexp-quote dom) "$") host))
+
+;;;###autoload
+(defun dnsResolve (host)
+  (url-gateway-nslookup-host host))
+
+;;;###autoload
+(defun isResolvable (host)
+  (if (string-match "^[0-9.]+$" host)
+      t
+    (not (string= host (url-gateway-nslookup-host host)))))
+
+;;;###autoload
+(defun isInNet (ip net mask)
+  (let ((netc (split-string ip "\\."))
+        (ipc  (split-string net "\\."))
+        (maskc (split-string mask "\\.")))
+    (if (or (/= (length netc) (length ipc))
+            (/= (length ipc) (length maskc)))
+        nil
+      (setq netc (mapcar 'string-to-int netc)
+            ipc (mapcar 'string-to-int ipc)
+            maskc (mapcar 'string-to-int maskc))
+      (and
+       (= (logand (nth 0 netc) (nth 0 maskc))
+          (logand (nth 0 ipc)  (nth 0 maskc)))
+       (= (logand (nth 1 netc) (nth 1 maskc))
+          (logand (nth 1 ipc)  (nth 1 maskc)))
+       (= (logand (nth 2 netc) (nth 2 maskc))
+          (logand (nth 2 ipc)  (nth 2 maskc)))
+       (= (logand (nth 3 netc) (nth 3 maskc))
+          (logand (nth 3 ipc)  (nth 3 maskc)))))))
+
+;; Netscape configuration file parsing
+(defvar url-ns-user-prefs nil
+  "Internal, do not use.")
+
+;;;###autoload
+(defun url-ns-prefs (&optional file)
+  (if (not file)
+      (setq file (expand-file-name "~/.netscape/preferences.js")))
+  (if (not (and (file-exists-p file)
+                (file-readable-p file)))
+      (message "Could not open %s for reading" file)
+    (save-excursion
+      (let ((false nil)
+            (true t))
+        (setq url-ns-user-prefs (make-hash-table :size 13 :test 'equal))
+        (set-buffer (get-buffer-create " *ns-parse*"))
+        (erase-buffer)
+        (insert-file-contents file)
+        (goto-char (point-min))
+        (while (re-search-forward "^//" nil t)
+          (replace-match ";;"))
+        (goto-char (point-min))
+        (while (re-search-forward "^user_pref(" nil t)
+          (replace-match "(url-ns-set-user-pref "))
+        (goto-char (point-min))
+        (while (re-search-forward "\"," nil t)
+          (replace-match "\""))
+        (goto-char (point-min))
+        (eval-buffer)))))
+
+(defun url-ns-set-user-pref (key val)
+  (puthash key val url-ns-user-prefs))
+
+;;;###autoload
+(defun url-ns-user-pref (key &optional default)
+  (gethash key url-ns-user-prefs default))
+
+(provide 'url-ns)
+
+;;; arch-tag: 69520992-cf97-40b4-9ad1-c866d3cae5bf
+;;; url-ns.el ends here
diff --git a/lisp/url/url-privacy.el b/lisp/url/url-privacy.el
index cb64cfbd4fc..50f46415b80 100644
--- a/lisp/url/url-privacy.el
+++ b/lisp/url/url-privacy.el
@@ -1,26 +1,27 @@
 ;;; url-privacy.el --- Global history tracking for URL package
+
+;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
+
 ;; Keywords: comm, data, processes, hypermedia
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Emacs.
-;;;
-;;; GNU Emacs is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Emacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;;; Boston, MA 02111-1307, USA.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Code:
 
 (eval-when-compile (require 'cl))
 (require 'url-vars)
@@ -79,3 +80,4 @@
 (provide 'url-privacy)
 
 ;;; arch-tag: fdaf95e4-98f0-4680-94c3-f3eadafabe1d
+;;; url-privacy.el ends here
diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el
new file mode 100644
index 00000000000..20f1b4b7ea7
--- /dev/null
+++ b/lisp/url/url-proxy.el
@@ -0,0 +1,79 @@
+;;; url-proxy.el --- Proxy server support
+
+;; Copyright (c) 1999 Free Software Foundation, Inc.
+
+;; Keywords: comm, data, processes, hypermedia
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Code:
+
+(require 'url-parse)
+(autoload 'url-warn "url")
+
+(defun url-default-find-proxy-for-url (urlobj host)
+  (cond
+   ((or (and (assoc "no_proxy" url-proxy-services)
+             (string-match
+              (cdr
+               (assoc "no_proxy" url-proxy-services))
+              host))
+        (equal "www" (url-type urlobj)))
+    "DIRECT")
+   ((cdr (assoc (url-type urlobj) url-proxy-services))
+    (concat "PROXY " (cdr (assoc (url-type urlobj) url-proxy-services))))
+   ;;
+   ;; Should check for socks
+   ;;
+   (t
+    "DIRECT")))
+
+(defvar url-proxy-locator 'url-default-find-proxy-for-url)
+
+(defun url-find-proxy-for-url (url host)
+  (let ((proxies (split-string (funcall url-proxy-locator url host) " *; *"))
+        (proxy nil)
+        (case-fold-search t))
+    ;; Not sure how I should handle gracefully degrading from one proxy to
+    ;; another, so for now just deal with the first one
+    ;; (while proxies
+    (if (listp proxies)
+        (setq proxy (car proxies))
+      (setq proxy proxies))
+    (cond
+     ((string-match "^direct" proxy) nil)
+     ((string-match "^proxy +" proxy)
+      (concat "http://" (substring proxy (match-end 0)) "/"))
+     ((string-match "^socks +" proxy)
+      (concat "socks://" (substring proxy (match-end 0))))
+     (t
+      (url-warn 'url (format "Unknown proxy directive: %s" proxy) 'critical)
+      nil))))
+
+(defun url-proxy (url callback &optional cbargs)
+  ;; Retrieve URL from a proxy.
+  ;; Expects `url-using-proxy' to be bound to the specific proxy to use."
+  (setq url-using-proxy (url-generic-parse-url url-using-proxy))
+  (let ((proxy-object (copy-sequence url)))
+    (url-set-target proxy-object nil)
+    (url-http url-using-proxy callback cbargs)))
+
+(provide 'url-proxy)
+
+;;; arch-tag: 4ff8882e-e498-42b7-abc5-acb449cdbc62
+;;; url-proxy.el ends here
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index 5d1f73e0d5d..1d0bfcf0c48 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -192,13 +192,13 @@ Will not do anything if `url-show-status' is nil."
                                                 (nth 1 (current-time-zone))
                                                 "GMT"))
          (parsed (timezone-parse-date gmt))
-         (day (cdr-safe (assoc (substring raw 0 3) weekday-alist)))
+         (day (cdr-safe (assoc (substring raw 0 3) url-weekday-alist)))
          (year nil)
          (month (car
                  (rassoc
-                  (string-to-int (aref parsed 1)) monthabbrev-alist)))
+                  (string-to-int (aref parsed 1)) url-monthabbrev-alist)))
          )
-    (setq day (or (car-safe (rassoc day weekday-alist))
+    (setq day (or (car-safe (rassoc day url-weekday-alist))
                   (substring raw 0 3))
           year (aref parsed 0))
     ;; This is needed for plexus servers, or the server will hang trying to
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index a33d8ba43e3..e4073db4271 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -1,26 +1,27 @@
 ;;; url-vars.el --- Variables for Uniform Resource Locator tool
+
+;; Copyright (c) 1996,1997,1998,1999,2001,2004 Free Software Foundation, Inc.
+
 ;; Keywords: comm, data, processes, hypermedia
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1996,1997,1998,1999,2001,2004 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Emacs.
-;;;
-;;; GNU Emacs is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Emacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;;; Boston, MA 02111-1307, USA.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Code:
 
 (require 'mm-util)
 
@@ -191,19 +192,6 @@ from the ACCESS_proxy environment variables."
                        (string :tag "Proxy")))
   :group 'url)
 
-(defcustom url-passwd-entry-func nil
-  "*Symbol indicating which function to call to read in a password.
-It will be set up depending on whether you are running EFS or ange-ftp
-at startup if it is nil.  This function should accept the prompt
-string as its first argument, and the default value as its second
-argument."
-  :type '(choice (const :tag "Guess" :value nil)
-                 (const :tag "Use Ange-FTP" :value ange-ftp-read-passwd)
-                 (const :tag "Use EFS"      :value efs-read-passwd)
-                 (const :tag "Use Password Package" :value read-passwd)
-                 (function :tag "Other"))
-  :group 'url-hairy)
-
 (defcustom url-standalone-mode nil
   "*Rely solely on the cache?"
   :type 'boolean
@@ -240,24 +228,6 @@ Should be an assoc list of headers/contents.")
 (defvar url-mime-encoding-string nil
   "*String to send in the Accept-encoding: field in HTTP requests.")
 
-;; `mm-mime-mule-charset-alist' in Gnus 5.8/9 contains elements whose
-;; cars aren't valid MIME charsets/coding systems, at least in Emacs.
-;; This gets it correct by construction in Emacs.  Fixme: DTRT for
-;; XEmacs -- its `coding-system-list' doesn't have the BASE-ONLY arg.
-(when (and (not (featurep 'xemacs))
-           (fboundp 'coding-system-list))
-  (setq mm-mime-mule-charset-alist
-        (apply
-         'nconc
-         (mapcar
-          (lambda (cs)
-            (when (and (coding-system-get cs 'mime-charset)
-                       (not (eq t (coding-system-get cs 'safe-charsets))))
-              (list (cons (coding-system-get cs 'mime-charset)
-                          (delq 'ascii
-                                (coding-system-get cs 'safe-charsets))))))
-          (coding-system-list 'base-only)))))
-
 ;; Perhaps the first few should actually be given decreasing `q's and
 ;; the list should be trimmed significantly.
 ;; Fixme: do something sane if we don't have `sort-coding-systems'
@@ -381,14 +351,14 @@ Currently supported methods:
 
 (defvar url-setup-done nil "Has setup configuration been done?")
 
-(defconst weekday-alist
+(defconst url-weekday-alist
   '(("Sunday" . 0) ("Monday" . 1) ("Tuesday" . 2) ("Wednesday" . 3)
     ("Thursday" . 4) ("Friday" . 5) ("Saturday" . 6)
     ("Tues" . 2) ("Thurs" . 4)
     ("Sun" . 0) ("Mon" . 1) ("Tue" . 2) ("Wed" . 3)
     ("Thu" . 4) ("Fri" . 5) ("Sat" . 6)))
 
-(defconst monthabbrev-alist
+(defconst url-monthabbrev-alist
   '(("Jan" . 1) ("Feb" . 2) ("Mar" . 3) ("Apr" . 4) ("May" . 5) ("Jun" . 6)
     ("Jul" . 7) ("Aug" . 8) ("Sep" . 9) ("Oct" . 10) ("Nov" . 11)
     ("Dec" . 12)))
@@ -425,6 +395,8 @@ This should be set, e.g. by mail user agents rendering HTML to avoid
 (defun url-vars-unload-hook ()
   (remove-hook 'set-language-environment-hook 'url-set-mime-charset-string))
 
+(add-hook 'url-vars-unload-hook 'url-vars-unload-hook)
+
 (provide 'url-vars)
 
 ;;; arch-tag: 29205e5f-c5ce-433c-8d5d-38cbaed64b49
diff --git a/lisp/url/url.el b/lisp/url/url.el
index f7b1b717681..75ddfdc3a2f 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -113,26 +113,6 @@ Emacs."
                                      noproxy "") "\\)"))
                       url-proxy-services))))
 
-    ;; Set the password entry funtion based on user defaults or guess
-    ;; based on which remote-file-access package they are using.
-    (cond
-     (url-passwd-entry-func nil)        ; Already been set
-     ((fboundp 'read-passwd)            ; Use secure password if available
-      (setq url-passwd-entry-func 'read-passwd))
-     ((or (featurep 'efs)               ; Using EFS
-          (featurep 'efs-auto))         ; or autoloading efs
-      (if (not (fboundp 'read-passwd))
-          (autoload 'read-passwd "passwd" "Read in a password" nil))
-      (setq url-passwd-entry-func 'read-passwd))
-     ((or (featurep 'ange-ftp)          ; Using ange-ftp
-          (and (boundp 'file-name-handler-alist)
-               (not (featurep 'xemacs)))) ; ??
-      (setq url-passwd-entry-func 'ange-ftp-read-passwd))
-     (t
-      (url-warn
-       'security
-       "(url-setup): Can't determine how to read passwords, winging it.")))
-  
     (url-setup-privacy-info)
     (run-hooks 'url-load-hook)
     (setq url-setup-done t)))