From e5566bd545c8557083a84f651b02a6090316dfed Mon Sep 17 00:00:00 2001
From: Miles Bader <miles@gnu.org>
Date: Sun, 4 Apr 2004 04:44:10 +0000
Subject: [PATCH] Resolve CVS conflicts

---
 lisp/url/url-about.el    | 8 +++++---
 lisp/url/url-auth.el     | 8 +++++---
 lisp/url/url-cache.el    | 8 +++++---
 lisp/url/url-cid.el      | 8 +++++---
 lisp/url/url-cookie.el   | 7 ++++---
 lisp/url/url-dav.el      | 4 +++-
 lisp/url/url-dired.el    | 8 +++++---
 lisp/url/url-expand.el   | 8 +++++---
 lisp/url/url-file.el     | 8 +++++---
 lisp/url/url-ftp.el      | 8 +++++---
 lisp/url/url-gw.el       | 6 ++++--
 lisp/url/url-handlers.el | 8 +++++---
 lisp/url/url-history.el  | 8 +++++---
 lisp/url/url-http.el     | 3 ++-
 lisp/url/url-https.el    | 8 +++++---
 lisp/url/url-imap.el     | 6 ++++--
 lisp/url/url-irc.el      | 8 +++++---
 lisp/url/url-ldap.el     | 6 ++++--
 lisp/url/url-mailto.el   | 8 +++++---
 lisp/url/url-methods.el  | 6 ++++--
 lisp/url/url-misc.el     | 8 +++++---
 lisp/url/url-news.el     | 8 +++++---
 lisp/url/url-nfs.el      | 8 +++++---
 lisp/url/url-ns.el       | 8 +++++---
 lisp/url/url-parse.el    | 6 ++++--
 lisp/url/url-privacy.el  | 8 +++++---
 lisp/url/url-proxy.el    | 8 +++++---
 lisp/url/url-util.el     | 6 ++++--
 lisp/url/url-vars.el     | 7 ++++---
 lisp/url/url.el          | 3 ++-
 lisp/url/vc-dav.el       | 4 +++-
 31 files changed, 137 insertions(+), 79 deletions(-)

diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el
index 4fbf2083fae..00d0d595304 100644
--- a/lisp/url/url-about.el
+++ b/lisp/url/url-about.el
@@ -1,7 +1,7 @@
 ;;; url-about.el --- Show internal URLs
-;; Author: $Author: wmperry $
-;; Created: $Date: 2001/11/24 22:30:21 $
-;; Version: $Revision: 1.1 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -98,3 +98,5 @@
       (error "URL does not know about `%s'" item))))
 
 (provide 'url-about)
+
+;;; arch-tag: 65dd7fca-db3f-4cb1-8026-7dd37d4a460e
diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index 5a88b32159c..4165f44484a 100644
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -1,7 +1,7 @@
 ;;; url-auth.el --- Uniform Resource Locator authorization modules
-;; Author: $Author: wmperry $
-;; Created: $Date: 2001/12/05 19:05:51 $
-;; Version: $Revision: 1.4 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -316,3 +316,5 @@ RATING   a rating between 1 and 10 of the strength of the authentication.
   (assoc scheme url-registered-auth-schemes))
 
 (provide 'url-auth)
+
+;;; arch-tag: 04058625-616d-44e4-9dbf-4b46b00b2a91
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index a6bf2847dd6..7a6cc21383e 100644
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -1,7 +1,7 @@
 ;;; url-cache.el --- Uniform Resource Locator retrieval tool
-;; Author: $Author: fx $
-;; Created: $Date: 2002/01/22 17:53:45 $
-;; Version: $Revision: 1.4 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -201,3 +201,5 @@ FILE can be created or overwritten."
      (t nil))))
 
 (provide 'url-cache)
+
+;;; arch-tag: 95b050a6-8e81-4f23-8e63-191b9d1d657c
diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el
index be380387acf..38ddd002daf 100644
--- a/lisp/url/url-cid.el
+++ b/lisp/url/url-cid.el
@@ -1,7 +1,7 @@
 ;;; url-cid.el --- Content-ID URL loader
-;; Author: $Author: fx $
-;; Created: $Date: 2001/05/05 16:35:58 $
-;; Version: $Revision: 1.3 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -63,3 +63,5 @@
       (url-cid-gnus (url-filename url))))
    (t
     (message "Unable to handle CID URL: %s" url))))
+
+;;; arch-tag: 23d9ab74-fad4-4dba-b1e7-292871e8bda5
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index eca89cb0f5a..d837077ade0 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -1,7 +1,7 @@
 ;;; url-cookie.el --- Netscape Cookie support
-;; Author: $Author: wmperry $
-;; Created: $Date: 2002/10/29 14:44:59 $
-;; Version: $Revision: 1.7 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -466,3 +466,4 @@ to run the `url-cookie-setup-save-timer' function manually."
 
 (provide 'url-cookie)
 
+;;; arch-tag: 2568751b-6452-4398-aa2d-303edadb54d7
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index ed5f04375ee..573bcc26ce0 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -4,7 +4,7 @@
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Maintainer: Bill Perry <wmperry@gnu.org>
-;; Version: $Revision: 1.6 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: url, vc
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -971,3 +971,5 @@ Returns nil if DIR contains no name starting with FILE.
 ;;; Miscellaneous stuff.
 
 (provide 'url-dav)
+
+;;; arch-tag: 2b14b7b3-888a-49b8-a490-17276a40e78e
diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el
index 9a9e45fa15d..0c97ff9dc13 100644
--- a/lisp/url/url-dired.el
+++ b/lisp/url/url-dired.el
@@ -1,7 +1,7 @@
 ;;; url-dired.el --- URL Dired minor mode
-;; Author: $Author: fx $
-;; Created: $Date: 2001/05/05 16:44:20 $
-;; Version: $Revision: 1.3 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, files
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -100,3 +100,5 @@ Example:  (add-minor-mode 'view-minor-mode \" View\" view-mode-map)"
   (url-dired-minor-mode t))
 
 (provide 'url-dired)
+
+;;; arch-tag: 2694f21a-43e1-4391-b3cb-cf6e5349f15f
diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el
index 49048dd323e..8fe9683acda 100644
--- a/lisp/url/url-expand.el
+++ b/lisp/url/url-expand.el
@@ -1,7 +1,7 @@
 ;;; url-expand.el --- expand-file-name for URLs
-;; Author: $Author: wmperry $
-;; Created: $Date: 1999/12/05 08:09:15 $
-;; Version: $Revision: 1.3 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -141,3 +141,5 @@ path components followed by `..' are removed, along with the `..' itself."
 	(url-set-filename urlobj (if query (concat file sepchar query) file))))))
 
 (provide 'url-expand)
+
+;;; arch-tag: 7b5f744b-b721-49da-be47-484631680a5a
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index fad9995f9ba..eeabc83e485 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -1,7 +1,7 @@
 ;;; url-file.el --- File retrieval code
-;; Author: $Author: fx $
-;; Created: $Date: 2002/04/22 09:14:24 $
-;; Version: $Revision: 1.11 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -237,3 +237,5 @@ to them."
   (url-file-create-wrapper file-truename (url &optional counter prev-dirs)))
 
 (provide 'url-file)
+
+;;; arch-tag: 010e914a-7313-494b-8a8c-6495a862157d
diff --git a/lisp/url/url-ftp.el b/lisp/url/url-ftp.el
index 19b55c199e3..1dc679a2418 100644
--- a/lisp/url/url-ftp.el
+++ b/lisp/url/url-ftp.el
@@ -1,7 +1,7 @@
 ;;; url-ftp.el --- FTP wrapper
-;; Author: $Author: wmperry $
-;; Created: $Date: 1999/11/30 12:47:21 $
-;; Version: $Revision: 1.1 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -42,3 +42,5 @@
 (defalias 'url-ftp 'url-file)
 
 (provide 'url-ftp)
+
+;;; arch-tag: 9c3e70c4-350f-4d4a-bb51-a1e9b459e7dc
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index d66a4468065..71e73ea14b7 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -1,7 +1,7 @@
 ;;; url-gw.el --- Gateway munging for URL loading
 ;; Author: Bill Perry <wmperry@gnu.org>
-;; Created: $Date: 2002/04/22 09:26:46 $
-;; $Revision: 1.8 $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -262,3 +262,5 @@ Will not make a connexion if `url-gateway-unplugged' is non-nil."
       conn)))
 
 (provide 'url-gw)
+
+;;; arch-tag: 1c4c0317-6d03-45b8-b3f3-838bd8f9d838
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index 8b6ebdf0518..d3f9800d0f0 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -1,7 +1,7 @@
 ;;; url-handlers.el --- file-name-handler stuff for URL loading
-;; Author: $Author: sds $
-;; Created: $Date: 2003/06/26 18:45:45 $
-;; Version: $Revision: 1.10 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -250,3 +250,5 @@ accessible."
        (auto-save-mode 0)))
 
 (provide 'url-handlers)
+
+;;; arch-tag: 7300b99c-cc83-42ff-9147-79b2723c62ac
diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el
index 77b58b6f660..44b269eeaee 100644
--- a/lisp/url/url-history.el
+++ b/lisp/url/url-history.el
@@ -1,7 +1,7 @@
 ;;; url-history.el --- Global history tracking for URL package
-;; Author: $Author: fx $
-;; Created: $Date: 2001/05/05 16:49:52 $
-;; Version: $Revision: 1.6 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -197,3 +197,5 @@ user for what type to save as."
     (error "url-completion-function very confused."))))
 
 (provide 'url-history)
+
+;;; arch-tag: fbbbaf63-db36-4e88-bc9f-2939aa93afb2
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index bdb6b38cf65..c0c0dd68a31 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1,6 +1,6 @@
 ;;; url-http.el --- HTTP retrieval routines
 ;; Author: Bill Perry <wmperry@gnu.org>
-;; Version: $Revision: 1.39 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1220,4 +1220,5 @@ p3p
 
 (provide 'url-http)
 
+;;; arch-tag: ba7c59ae-c0f4-4a31-9617-d85f221732ee
 ;;; url-http.el ends here
diff --git a/lisp/url/url-https.el b/lisp/url/url-https.el
index 27652792d49..d603740357e 100644
--- a/lisp/url/url-https.el
+++ b/lisp/url/url-https.el
@@ -1,7 +1,7 @@
 ;;; url-https.el --- HTTP over SSL routines
-;; Author: $Author: wmperry $
-;; Created: $Date: 2001/11/22 14:32:13 $
-;; Version: $Revision: 1.3 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -51,3 +51,5 @@
 (url-https-create-secure-wrapper file-attributes (url))
 
 (provide 'url-https)
+
+;;; arch-tag: c3645ac5-c248-4d12-ad41-7c4b6f7b6d19
diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el
index 3d143759cfb..d5f1813a294 100644
--- a/lisp/url/url-imap.el
+++ b/lisp/url/url-imap.el
@@ -1,7 +1,7 @@
 ;;; url-imap.el --- IMAP retrieval routines
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
-;; Created: $Date: 2002/01/22 17:52:16 $
-;; Version: $Revision: 1.4 $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -79,3 +79,5 @@
 	     ;; xxx list messages in mailbox (start gnus?)
 	     )))
     (current-buffer)))
+
+;;; arch-tag: 034991ff-5425-48ea-b911-c96c90e6f47d
diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el
index c4005d19ec7..9ff4e122d52 100644
--- a/lisp/url/url-irc.el
+++ b/lisp/url/url-irc.el
@@ -1,7 +1,7 @@
 ;;; url-irc.el --- IRC URL interface
-;; Author: $Author: wmperry $
-;; Created: $Date: 1999/12/24 12:13:33 $
-;; Version: $Revision: 1.2 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -76,3 +76,5 @@ PASSWORD - What password to use"
     nil))
     
 (provide 'url-irc)
+
+;;; arch-tag: 2e5eecf8-9eb3-436b-9fbd-c26f2fb2bf3e
diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el
index 67409e39a1d..b2d7980be06 100644
--- a/lisp/url/url-ldap.el
+++ b/lisp/url/url-ldap.el
@@ -1,6 +1,6 @@
 ;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code
-;; Author: $Author: wmperry $
-;; Created: $Date: 1999/11/26 12:11:50 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
 ;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes
 
@@ -231,3 +231,5 @@
     (current-buffer)))
 
 (provide 'url-ldap)
+
+;;; arch-tag: 6230e21c-41ae-4174-bd83-82c835676fc8
diff --git a/lisp/url/url-mailto.el b/lisp/url/url-mailto.el
index 02e410411f5..a8492834711 100644
--- a/lisp/url/url-mailto.el
+++ b/lisp/url/url-mailto.el
@@ -1,7 +1,7 @@
 ;;; url-mail.el --- Mail Uniform Resource Locator retrieval code
-;; Author: $Author: fx $
-;; Created: $Date: 2001/10/05 17:04:06 $
-;; Version: $Revision: 1.4 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -127,3 +127,5 @@
     nil))
 
 (provide 'url-mailto)
+
+;;; arch-tag: 7b7ad52e-8760-497b-9444-75fae14e34c5
diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el
index dfb26c9a228..89325e6c0b3 100644
--- a/lisp/url/url-methods.el
+++ b/lisp/url/url-methods.el
@@ -1,7 +1,7 @@
 ;;; url-methods.el --- Load URL schemes as needed
 ;; Author: $Author: monnier $
-;; Created: $Date: 2004/04/04 01:21:46 $
-;; Version: $Revision: 1.1.1.1 $
+;; Created: $Date: 2004/04/04 03:10:58 $
+;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -146,3 +146,5 @@ it has not already been loaded."
 	(plist-get url-scheme-default-properties property))))
 
 (provide 'url-methods)
+
+;;; arch-tag: 336863f8-5a07-4906-9be5-b3c6bcebbe67
diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el
index 9a9e58b263a..95a26ec4016 100644
--- a/lisp/url/url-misc.el
+++ b/lisp/url/url-misc.el
@@ -1,7 +1,7 @@
 ;;; url-misc.el --- Misc Uniform Resource Locator retrieval code
-;; Author: $Author: fx $
-;; Created: $Date: 2002/04/22 22:23:59 $
-;; Version: $Revision: 1.5 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -117,3 +117,5 @@
       (current-buffer))))
 
 (provide 'url-misc)
+
+;;; arch-tag: 8c544e1b-d8bc-40a6-b319-f1f37fef65a0
diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el
index f758b12f689..298c51dde89 100644
--- a/lisp/url/url-news.el
+++ b/lisp/url/url-news.el
@@ -1,7 +1,7 @@
 ;;; url-news.el --- News Uniform Resource Locator retrieval code
-;; Author: $Author: fx $
-;; Created: $Date: 2001/05/22 16:13:00 $
-;; Version: $Revision: 1.3 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -133,3 +133,5 @@
     (url-news url)))
 
 (provide 'url-news)
+
+;;; arch-tag: 8975be13-04e8-4d38-bfff-47918e3ad311
diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el
index d3e5b4d4128..a7ea476a647 100644
--- a/lisp/url/url-nfs.el
+++ b/lisp/url/url-nfs.el
@@ -1,7 +1,7 @@
 ;;; url-nfs.el --- NFS URL interface
-;; Author: $Author: fx $
-;; Created: $Date: 2001/05/22 16:10:50 $
-;; Version: $Revision: 1.3 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -95,3 +95,5 @@ Each can be used any number of times.")
   (url-nfs-create-wrapper file-truename (url &optional counter prev-dirs)))
 
 (provide 'url-nfs)
+
+;;; arch-tag: cdf9c9ba-b7d2-4c29-8b48-7ae9bbc0d437
diff --git a/lisp/url/url-ns.el b/lisp/url/url-ns.el
index 0800f70700a..759d2e00c1c 100644
--- a/lisp/url/url-ns.el
+++ b/lisp/url/url-ns.el
@@ -1,7 +1,7 @@
 ;;; url-ns.el --- Various netscape-ish functions for proxy definitions
-;; Author: $Author: fx $
-;; Created: $Date: 2000/12/20 21:08:02 $
-;; Version: $Revision: 1.2 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -104,3 +104,5 @@
   (gethash key url-ns-user-prefs default))
 
 (provide 'url-ns)
+
+;;; arch-tag: 69520992-cf97-40b4-9ad1-c866d3cae5bf
diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index bab39476559..dd08bc458bc 100644
--- a/lisp/url/url-parse.el
+++ b/lisp/url/url-parse.el
@@ -1,7 +1,7 @@
 ;;; url-parse.el --- Uniform Resource Locator parser
 ;; Author: $Author: monnier $
-;; Created: $Date: 2004/04/04 01:21:46 $
-;; Version: $Revision: 1.1.1.1 $
+;; Created: $Date: 2004/04/04 03:10:58 $
+;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -204,3 +204,5 @@ Format is:
 	(vector prot user pass host port file refs attr full))))))
 
 (provide 'url-parse)
+
+;;; arch-tag: f338325f-71ab-4bee-93cc-78fb9a03d403
diff --git a/lisp/url/url-privacy.el b/lisp/url/url-privacy.el
index dcb244e5a21..00c5d899258 100644
--- a/lisp/url/url-privacy.el
+++ b/lisp/url/url-privacy.el
@@ -1,7 +1,7 @@
 ;;; url-privacy.el --- Global history tracking for URL package
-;; Author: $Author: fx $
-;; Created: $Date: 2001/10/05 17:10:26 $
-;; Version: $Revision: 1.4 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -81,3 +81,5 @@
 	 (t nil))))
 
 (provide 'url-privacy)
+
+;;; arch-tag: fdaf95e4-98f0-4680-94c3-f3eadafabe1d
diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el
index b13a0545528..9b4fdad09e5 100644
--- a/lisp/url/url-proxy.el
+++ b/lisp/url/url-proxy.el
@@ -1,7 +1,7 @@
 ;;; url-proxy.el --- Proxy server support
-;; Author: $Author: fx $
-;; Created: $Date: 2001/10/11 21:09:35 $
-;; Version: $Revision: 1.5 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -76,3 +76,5 @@
     (url-http url-using-proxy callback cbargs)))
 
 (provide 'url-proxy)
+
+;;; arch-tag: 4ff8882e-e498-42b7-abc5-acb449cdbc62
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index d81a059ee02..109d88d5ebc 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -1,7 +1,7 @@
 ;;; url-util.el --- Miscellaneous helper routines for URL library
 ;; Author: Bill Perry <wmperry@gnu.org>
-;; Created: $Date: 2002/04/22 09:16:11 $
-;; Version: $Revision: 1.14 $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -485,3 +485,5 @@ Has a preference for looking backward when not directly on a symbol."
 	   (mail-header-extract)))))
 
 (provide 'url-util)
+
+;;; arch-tag: 24352abc-5a5a-412e-90cd-313b26bed5c9
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 4e09c441a45..54698d33273 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -1,7 +1,7 @@
 ;;; url-vars.el --- Variables for Uniform Resource Locator tool
-;; Author: $Author: fx $
-;; Created: $Date: 2002/04/22 09:25:02 $
-;; Version: $Revision: 1.14 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -432,4 +432,5 @@ This should be set, e.g. by mail user agents rendering HTML to avoid
 
 (provide 'url-vars)
 
+;;; arch-tag: 29205e5f-c5ce-433c-8d5d-38cbaed64b49
 ;;; url-vars.el ends here
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 22d5aa59997..34b8b03e865 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -1,6 +1,6 @@
 ;;; url.el --- Uniform Resource Locator retrieval tool
 ;; Author: Bill Perry <wmperry@gnu.org>
-;; Version: $Revision: 1.15 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -266,4 +266,5 @@ no further processing).  URL is either a string or a parsed URL."
 
 (provide 'url)
 
+;;; arch-tag: bc182f1f-d187-4f10-b961-47af2066579a
 ;;; url.el ends here
diff --git a/lisp/url/vc-dav.el b/lisp/url/vc-dav.el
index dc03361dcc8..3f468900441 100644
--- a/lisp/url/vc-dav.el
+++ b/lisp/url/vc-dav.el
@@ -4,7 +4,7 @@
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Maintainer: Bill Perry <wmperry@gnu.org>
-;; Version: $Revision: 1.3 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: url, vc
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -175,3 +175,5 @@ It should return a status of either 0 (no differences found), or
 ;;    deleting the resource.
 
 (provide 'vc-dav)
+
+;;; arch-tag: 0a0fb9fe-8190-4c0a-a179-5c291d3a467e
-- 
2.39.5