Make the URL library use records.

* lisp/url/url.el, lisp/url/url-cache.el, lisp/url/url-dav.el,
lisp/url/url-expand.el, lisp/url/url-file.el, lisp/url/url-imap.el,
lisp/url/url-ldap.el: Use `url-p' instead of `vectorp'.

* lisp/url/url-http.el (url-http): Check for type `url' instead of
`vector'.

diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index 192bbb2481f45392659ff00dbf07f65f881477e6..a7247dfe10a77a0102519dd9288a75c72d4e29ae 100644 (file)
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -184,7 +184,7 @@ Very fast if you have an `md5' primitive function, suitably fast otherwise."
            ;; if it has been specified: e.g. http://www.example.com:80 will
            ;; be transcoded as http://www.example.com
            (url-recreate-url
-            (if (vectorp url) url
+            (if (url-p url) url
               (url-generic-parse-url url)))))
 
 ;;;###autoload

diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index f47bc5da3e475b1daa34a76f371a5f3ffe0f63df..59b836ca6d1cb5db549958abd72809f109f96ffc 100644 (file)
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -518,7 +518,7 @@ FAILURE-RESULTS is a list of (URL STATUS)."
                                    depth '(("Timeout" . "Infinite"))))
 
     ;; Get the parent URL ready for expand-file-name
-    (if (not (vectorp url))
+    (if (not (url-p url))
        (setq url (url-generic-parse-url url)))
 
     ;; Walk thru the response list, fully expand the URL, and grab the
@@ -540,7 +540,7 @@ FAILURE-RESULTS is a list of (URL STATUS)."
        (child-url nil)
        (child-results nil)
        (results nil))
-    (if (not (vectorp url))
+    (if (not (url-p url))
        (setq url (url-generic-parse-url url)))
 
     (while response

diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el
index cc9341bdf5f28803655567429e71de9aad7df179..9ceaa025fb32924e79c525c04b1f1c62bc31da43 100644 (file)
--- a/lisp/url/url-expand.el
+++ b/lisp/url/url-expand.el
@@ -73,7 +73,7 @@ path components followed by `..' are removed, along with the `..' itself."
 
   ;; Need to figure out how/where to expand the fragment relative to
   (setq default (cond
-                ((vectorp default)
+                ((url-p default)
                  ;; Default URL has already been parsed
                  default)
                 (default

diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index 8e63a9073e34e66c2e2166ab1a23717f836001dd..1dda1d3325dfbd2682c5a312ad1b35c5c09253d6 100644 (file)
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -89,7 +89,7 @@ to them."
                            keep-date &optional msg cont nowait))
 
 (defun url-file-build-filename (url)
-  (if (not (vectorp url))
+  (if (not (url-p url))
       (setq url (url-generic-parse-url url)))
   (let* ((user (url-user url))
         (pass (url-password url))

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 90f2e59cc5b4630ec95bbecaff7a2059580fb7ec..06d32861b2e60fdd7df9f5b006ce08995a921d30 100644 (file)
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1243,7 +1243,7 @@ Optional arg GATEWAY-METHOD specifies the gateway to be used,
 overriding the value of `url-gateway-method'.
 
 The return value of this function is the retrieval buffer."
-  (cl-check-type url vector "Need a pre-parsed URL.")
+  (cl-check-type url url "Need a pre-parsed URL.")
   (let* (;; (host (url-host (or url-using-proxy url)))
         ;; (port (url-port (or url-using-proxy url)))
         (nsm-noninteractive (or url-request-noninteractive

diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el
index 1195a344c90524cbf06a58cab7f2b91e48340372..b8fe4ed5ff79712cf5d3d36ee515f41f69c35e10 100644 (file)
--- a/lisp/url/url-imap.el
+++ b/lisp/url/url-imap.el
@@ -50,7 +50,7 @@
                          (nnimap-authenticator ,authenticator)))))
 
 (defun url-imap (url)
-  (unless (vectorp url)
+  (unless (url-p url)
     (signal 'wrong-type-error (list "Need a pre-parsed URL." url)))
   (with-current-buffer (generate-new-buffer " *url-imap*")
     (mm-disable-multibyte)

diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el
index 8f5f6f55d0a9f494db02deedbbc0ae0e96dbf0db..d9a18e554fa0ae212dd91c1819ca0b92c9c0abf4 100644 (file)
--- a/lisp/url/url-ldap.el
+++ b/lisp/url/url-ldap.el
@@ -115,11 +115,11 @@
 (defun url-ldap (url)
   "Perform an LDAP search specified by URL.
 The return value is a buffer displaying the search results in HTML.
-URL can be a URL string, or a URL vector of the type returned by
+URL can be a URL string, or a URL record of the type returned by
 `url-generic-parse-url'."
   (if (stringp url)
       (setq url (url-generic-parse-url (url-unhex-string url)))
-    (if (not (vectorp url))
+    (if (not (url-p url))
         (error "Argument is not a valid URL")))
   (with-current-buffer (generate-new-buffer " *url-ldap*")
     (setq url-current-object url)

diff --git a/lisp/url/url.el b/lisp/url/url.el
index 2eec1c44defa33df5179b23b58b4a3dcf6a44a42..75cf77deaa4ecb8df9c221881157b103c8d43fe8 100644 (file)
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -186,7 +186,7 @@ URL-encoded before it's used."
   (when (stringp url)
     (set-text-properties 0 (length url) nil url)
     (setq url (url-encode-url url)))
-  (if (not (vectorp url))
+  (if (not (url-p url))
       (setq url (url-generic-parse-url url)))
   (if (not (functionp callback))
       (error "Must provide a callback function to url-retrieve"))