[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100265: * url-cookie.el (url-cookie-retrieve): Handle null LOCALPART (Bug#7543).

[Chong Yidong]

------------------------------------------------------------
revno: 100265
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-12-04 17:41:41 -0500
message:
  * url-cookie.el (url-cookie-retrieve): Handle null LOCALPART (Bug#7543).
  Suggested by Lennart Borgman.
modified:
  lisp/url/ChangeLog
  lisp/url/url-cookie.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2010-09-18 20:43:13 +0000
+++ b/lisp/url/ChangeLog        2010-12-04 22:41:41 +0000
@@ -1,3 +1,8 @@
+2010-12-04  Chong Yidong  <address@hidden>
+
+       * url-cookie.el (url-cookie-retrieve): Handle null LOCALPART.
+       Suggested by Lennart Borgman (Bug#7543).
+
 2010-09-18  Glenn Morris  <address@hidden>
 
        * url-cache.el (url-is-cached): Doc fix.

=== modified file 'lisp/url/url-cookie.el'
--- a/lisp/url/url-cookie.el    2010-09-09 05:38:43 +0000
+++ b/lisp/url/url-cookie.el    2010-12-04 22:41:41 +0000
@@ -198,7 +198,7 @@
     (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 @@
            (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)