(url-recreate-url-attributes): New function, code moved from `url-recreate-url'.

(url-recreate-url): Use it.  Put the `url-target' at the end of the URL.

diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index f84bf1a7ba2a87d98170a66a9c8cb1c3d4d0c151..1e4d93a861e38dc21019bf3ed54a238c59377c0d 100644 (file)
--- a/lisp/url/url-parse.el
+++ b/lisp/url/url-parse.el
@@ -100,17 +100,20 @@
                   (not (equal (url-port urlobj)
                               (url-scheme-get-property (url-type urlobj) 'default-port))))
              (format ":%d" (url-port urlobj)))
-         (or (url-filename urlobj) "/")
+         (or (url-filename urlobj) "/")          
+         (url-recreate-url-attributes urlobj)
          (if (url-target urlobj)
-             (concat "#" (url-target urlobj)))
-         (if (url-attributes urlobj)
-             (concat ";"
-                     (mapconcat
-                      (function
-                       (lambda (x)
-                         (if (cdr x)
-                             (concat (car x) "=" (cdr x))
-                           (car x)))) (url-attributes urlobj) ";")))))
+             (concat "#" (url-target urlobj)))))
+
+(defun url-recreate-url-attributes (urlobj)
+  "Recreate the attributes of an URL string from the parsed URLOBJ."
+  (when (url-attributes urlobj)
+    (concat ";"
+           (mapconcat (lambda (x)
+                         (if (cdr x)
+                             (concat (car x) "=" (cdr x))
+                           (car x)))
+                       (url-attributes urlobj) ";"))))
 
 ;;;###autoload
 (defun url-generic-parse-url (url)