[Emacs-diffs] master 1c16fbd: Make url-cookie-write-file be more permissive

[Lars Ingebrigtsen]

branch: master
commit 1c16fbd1b281a46b07028ca78dbaab9a0ec6fd2f
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Make url-cookie-write-file be more permissive
    
    * lisp/url/url-cookie.el (url-cookie-write-file): If
    `url-cookie-file' isn't set (due to url.el not being used yet),
    don't error out in this function (bug#23183).
---
 lisp/url/url-cookie.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index 76c18b7..29487e8 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -139,7 +139,8 @@ i.e. 1970-1-1) are loaded as expiring one year from now 
instead."
     (set var new)))
 
 (defun url-cookie-write-file (&optional fname)
-  (when url-cookies-changed-since-last-save
+  (when (and url-cookies-changed-since-last-save
+             url-cookie-file)
     (or fname (setq fname (expand-file-name url-cookie-file)))
     (if (condition-case nil
             (progn