From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 15 Jan 2009 13:59:50 +0000 (+0000)
Subject: (url-cookie-retrieve): Fix last change.
X-Git-Tag: emacs-pretest-23.0.90~438
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7feadb909b3011e9e3dd728ff0a847c78a01a755;p=emacs.git

(url-cookie-retrieve): Fix last change.
---

diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index 9a9c4671332..e1945c644e1 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -251,10 +251,12 @@ telling Microsoft that."
 	  (while cookies
 	    (setq cur (car cookies)
 		  cookies (cdr cookies)
-		  localpart-match (let ((lp (url-cookie-localpart cur)))
-				    (when lp
-				      (concat "^" (regexp-quote lp)))))
-	    (if (and (equal localpart localpart-match)
+		  localpart-match (url-cookie-localpart cur))
+	    (if (and (if (stringp localpart-match)
+			 (string-match (concat "^" (regexp-quote
+						    localpart-match))
+				       localpart)
+		       (equal localpart localpart-match))
 		     (not (url-cookie-expired-p cur)))
 		(setq retval (cons cur retval))))))
     retval))