[Emacs-diffs] /srv/bzr/emacs/trunk r108224: Make URL redirection work again.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 108224
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2012-05-14 09:56:04 +0200
message:
  Make URL redirection work again.
  
  The previous changes would make redirection fail, since the expansion
  would end up with URLs that looked like "http:www.bing.com/hello".
  
  * url-expand.el (url-default-expander): Copy over the fullness of
  the new URL object based on the definition URL object.
modified:
  lisp/url/ChangeLog
  lisp/url/url-expand.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2012-05-10 06:27:12 +0000
+++ b/lisp/url/ChangeLog        2012-05-14 07:56:04 +0000
@@ -1,3 +1,8 @@
+2012-05-14  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * url-expand.el (url-default-expander): Copy over the fullness of
+       the new URL object based on the definition URL object.
+
 2012-05-10  Chong Yidong  <address@hidden>
 
        * url-parse.el (url-path-and-query, url-port-if-non-default): New

=== modified file 'lisp/url/url-expand.el'
--- a/lisp/url/url-expand.el    2012-01-19 07:21:25 +0000
+++ b/lisp/url/url-expand.el    2012-05-14 07:56:04 +0000
@@ -116,13 +116,17 @@
     (setf (url-port urlobj) (or (url-port urlobj)
                                 (and (string= (url-type urlobj)
                                               (url-type defobj))
-                                     (url-port defobj))))
+                                    (url-port defobj))))
     (if (not (string= "file" (url-type urlobj)))
        (setf (url-host urlobj) (or (url-host urlobj) (url-host defobj))))
     (if (string= "ftp"  (url-type urlobj))
        (setf (url-user urlobj) (or (url-user urlobj) (url-user defobj))))
     (if (string= (url-filename urlobj) "")
        (setf (url-filename urlobj) "/"))
+    ;; If the object we're expanding from is full, then we are now
+    ;; full.
+    (unless (url-fullness urlobj)
+      (setf (url-fullness urlobj) (url-fullness defobj)))
     (if (string-match "^/" (url-filename urlobj))
        nil
       (let ((query nil)