Merge from emacs-23

2 files changed, 24 insertions, 18 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 44cc511c99c..5fd96e43b6b 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * url-cookie.el (url-cookie-retrieve): Handle null LOCALPART.
+        Suggested by Lennart Borgman (Bug#7543).
+
 2010-11-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * url-file.el (url-file-build-filename): Avoid interpreting
@@ -14,8 +19,8 @@
 
 2010-10-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * url-http.el (url-http-wait-for-headers-change-function): Protect
-        against url-http-response-status for degenerate documents.
+        * url-http.el (url-http-wait-for-headers-change-function):
+        Protect against url-http-response-status for degenerate documents.
         (url-http-wait-for-headers-change-function): Revert previous
         change.  It lead to really slow loads.
 
@@ -31,7 +36,7 @@
 
 2010-10-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * url-vars.el (url-mime-charset-string): Changed the default to
+        * url-vars.el (url-mime-charset-string): Change the default to
         nil to avoid sending 1171 bytes of not very useful data to the
         HTTP server every request.
 
@@ -119,8 +124,8 @@
 2010-07-01  Mark A. Hershberger  <mah@everybody.org>
 
         * url-http.el (url-http-create-request): Add a CRLF on the end so
-        that POSTs with content to https urls work.  See
-        <https://bugs.launchpad.net/mediawiki-el/+bug/540759>
+        that POSTs with content to https urls work.
+        See <https://bugs.launchpad.net/mediawiki-el/+bug/540759>
 
 2010-06-22  Mark A. Hershberger  <mah@everybody.org>
 
@@ -602,8 +607,8 @@
         * url-http.el (url-http-proxy): New variable.
         (url-http-create-request): Use it.  Don't use `url-proxy-object'.
         (url-http): Treat `url' argument as resource to download, and
-        dynamic variable `url-using-proxy' as proxy to use.  Set
-        `url-current-object' to actual URL, and `url-http-proxy' to proxy
+        dynamic variable `url-using-proxy' as proxy to use.
+        Set `url-current-object' to actual URL, and `url-http-proxy' to proxy
         used.
         (url-http-handle-cookies): Assume that `url-current-object' does
         not point to the proxy used.
@@ -619,24 +624,24 @@
         (url-proxy): Bind it instead of `proxy-object'.
 
         * url-http.el (url-http-create-request): Remove url argument, use
-        the buffer-local variable `url-http-target-url' instead.  Both
-        callers updated.  Simplify proxy handling.
+        the buffer-local variable `url-http-target-url' instead.
+        Both callers updated.  Simplify proxy handling.
         (url-http): Don't make proxy-object buffer local.
 
         * url.el (url-retrieve-internal): Bind url-proxy-object to nil.
 
 2006-11-26  Magnus Henoch  <mange@freemail.hu>
 
-        * url-http.el (url-http-wait-for-headers-change-function): Use
-        `when' instead of `if' when possible.
+        * url-http.el (url-http-wait-for-headers-change-function):
+        Use `when' instead of `if' when possible.
         (url-http): Define url-http-response-version.
         (url-http-parse-response): Set it.
         (url-http-parse-headers): Use it to determine keep-alive behavior.
 
 2006-11-23  Diane Murray  <disumu@x3y2z1.net>  (tiny change)
 
-        * url-http.el (url-http-content-length-after-change-function): Use
-        `url-lazy-message'.
+        * url-http.el (url-http-content-length-after-change-function):
+        Use `url-lazy-message'.
 
         * url-util.el (url-display-percentage): Only show a message if
         `url-show-status' is non-nil.
@@ -1018,8 +1023,8 @@
         (url-cookie-generate-header-lines): Likewise.
         (url-cookie-handle-set-cookie): Likewise.
         (url-cookie-create): Expect :localpart instead of :path.
-        (url-cookie-localpart): Renamed from url-cookie-path.
-        (url-cookie-set-localpart): Renamed from url-cookie-set-path.
+        (url-cookie-localpart): Rename from url-cookie-path.
+        (url-cookie-set-localpart): Rename from url-cookie-set-path.
         (url-cookie-file): Doc fix.
         (url-cookie-p): Add doc string.
 
@@ -2236,7 +2241,7 @@
         message when we have to contact a host so the user always gets
         at least some feedback.
 
-        * lisp/url-expand.el (url-expander-remove-relative-links): Moved and
+        * lisp/url-expand.el (url-expander-remove-relative-links): Move and
         renamed function.
         (url-default-expander): Use it.
 
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index e056db38a98..ec0974e9d76 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -198,7 +198,7 @@ telling Microsoft that."
     (and exp (> (float-time) (float-time (date-to-time exp))))))
 
 (defun url-cookie-retrieve (host &optional localpart secure)
-  "Retrieve all the netscape-style cookies for a specified HOST and LOCALPART."
+  "Retrieve all cookies for a specified HOST and LOCALPART."
   (let ((storage (if secure
                      (append url-cookie-secure-storage url-cookie-storage)
                    url-cookie-storage))
@@ -226,7 +226,8 @@ telling Microsoft that."
             (setq cur (car cookies)
                   cookies (cdr cookies)
                   localpart-match (url-cookie-localpart cur))
-            (if (and (if (stringp localpart-match)
+            (if (and (if (and (stringp localpart-match)
+                              (stringp localpart))
                          (string-match (concat "^" (regexp-quote
                                                     localpart-match))
                                        localpart)