2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 81ba66736b0..9abb65d389d 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url-cookie.el (url-cookie-write-file): Create parent dir.
+
+        * url.el (url-configuration-directory): Use ~/.emacs.d if possible.
+
 2005-12-07  Klaus Straubinger  <KSNetz@Arcor.DE>  (tiny change)
 
         * url-cookie.el (url-cookie-save-interval): Simplify.
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index 480a16c204d..3772846607a 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -148,6 +148,8 @@ telling Microsoft that."
 ;;;###autoload
 (defun url-cookie-write-file (&optional fname)
   (setq fname (or fname url-cookie-file))
+  (unless (file-directory-p (file-name-directory fname))
+    (ignore-errors (make-directory (file-name-directory fname))))
   (cond
    ((not url-cookies-changed-since-last-save) nil)
    ((not (file-writable-p fname))
@@ -155,8 +157,7 @@ telling Microsoft that."
    (t
     (url-cookie-clean-up)
     (url-cookie-clean-up t)
-    (save-excursion
-      (set-buffer (get-buffer-create " *cookies*"))
+    (with-current-buffer (get-buffer-create " *cookies*")
       (erase-buffer)
       (fundamental-mode)
       (insert ";; Emacs-W3 HTTP cookies file\n"