diff options
| author | Lars Ingebrigtsen | 2018-04-15 21:50:38 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2018-04-15 21:50:38 +0200 |
| commit | 1c16fbd1b281a46b07028ca78dbaab9a0ec6fd2f (patch) | |
| tree | 911ed4d4561a5abfa5619fbbd9245087b1e10370 | |
| parent | 2e1caf3254ba6bf6bd764b60b24e298995ec2cb9 (diff) | |
| download | emacs-1c16fbd1b281a46b07028ca78dbaab9a0ec6fd2f.tar.gz emacs-1c16fbd1b281a46b07028ca78dbaab9a0ec6fd2f.zip | |
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).
| -rw-r--r-- | lisp/url/url-cookie.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el index 76c18b756f7..29487e83c6f 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." | |||
| 139 | (set var new))) | 139 | (set var new))) |
| 140 | 140 | ||
| 141 | (defun url-cookie-write-file (&optional fname) | 141 | (defun url-cookie-write-file (&optional fname) |
| 142 | (when url-cookies-changed-since-last-save | 142 | (when (and url-cookies-changed-since-last-save |
| 143 | url-cookie-file) | ||
| 143 | (or fname (setq fname (expand-file-name url-cookie-file))) | 144 | (or fname (setq fname (expand-file-name url-cookie-file))) |
| 144 | (if (condition-case nil | 145 | (if (condition-case nil |
| 145 | (progn | 146 | (progn |