Mercurial > emacs
diff lisp/url/url-cookie.el @ 111945:c00190a8c8ef
Merge from emacs-23
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 13 Dec 2010 10:27:36 -0500 |
| parents | 1d1ed3e3e171 3d34c0b303ff |
| children | b5bb4bf62d4a |
line wrap: on
line diff
--- a/lisp/url/url-cookie.el Mon Dec 13 04:22:39 2010 +0000 +++ b/lisp/url/url-cookie.el Mon Dec 13 10:27:36 2010 -0500 @@ -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)