diff options
| -rw-r--r-- | lisp/url/ChangeLog | 14 | ||||
| -rw-r--r-- | lisp/url/url-cookie.el | 13 |
2 files changed, 19 insertions, 8 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index cc2d1eace59..3a560e7bb68 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,17 @@ +2006-01-05 Stefan Monnier <monnier@iro.umontreal.ca> + + * url-cookie.el (url-cookie-parse-file): Don't complain of missing file. + (url-cookie-parse-file, url-cookie-write-file, url-cookie-retrieve) + (url-cookie-generate-header-lines, url-cookie-handle-set-cookie) + (url-cookie-setup-save-timer): Remove autoload cookies. + They're only called from files that require url-cookie anyway. + + * url-history.el (url-history-setup-save-timer) + (url-history-parse-history, url-history-save-history): + Remove autoload cookies. They're only called from url.el which requires + url-history anyway. + (url-history-parse-history): Don't complain if the file is missing. + 2006-01-02 Stefan Monnier <monnier@iro.umontreal.ca> * url-handlers.el (url-retrieve-synchronously): Don't autoload. diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el index 3772846607a..53ba75f4cbb 100644 --- a/lisp/url/url-cookie.el +++ b/lisp/url/url-cookie.el @@ -1,7 +1,7 @@ ;;; url-cookie.el --- Netscape Cookie support ;; Copyright (C) 1996, 1997, 1998, 1999, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia @@ -109,12 +109,14 @@ telling Microsoft that." (defvar url-cookies-changed-since-last-save nil "Whether the cookies list has changed since the last save operation.") -;;;###autoload (defun url-cookie-parse-file (&optional fname) (setq fname (or fname url-cookie-file)) (condition-case () (load fname nil t) - (error (message "Could not load cookie file %s" fname)))) + (error + ;; It's completely normal for the cookies file not to exist yet. + ;; (message "Could not load cookie file %s" fname) + ))) (defun url-cookie-clean-up (&optional secure) (let* ( @@ -145,7 +147,6 @@ telling Microsoft that." (setq new (cons cur new)))) (set var new))) -;;;###autoload (defun url-cookie-write-file (&optional fname) (setq fname (or fname url-cookie-file)) (unless (file-directory-p (file-name-directory fname)) @@ -250,7 +251,6 @@ telling Microsoft that." (* 1 (string-to-number (aref exp-time 0)))))) (> (- cur-norm exp-norm) 1)))))) -;;;###autoload (defun url-cookie-retrieve (host localpart &optional secure) "Retrieve all the netscape-style cookies for a specified HOST and LOCALPART." (let ((storage (if secure @@ -278,7 +278,6 @@ telling Microsoft that." (setq retval (cons cur retval)))))) retval)) -;;;###autoload (defun url-cookie-generate-header-lines (host localpart secure) (let* ((cookies (url-cookie-retrieve host localpart secure)) (retval nil) @@ -344,7 +343,6 @@ telling Microsoft that." (t nil)))) -;;;###autoload (defun url-cookie-handle-set-cookie (str) (setq url-cookies-changed-since-last-save t) (let* ((args (url-parse-args str t)) @@ -457,7 +455,6 @@ to run the `url-cookie-setup-save-timer' function manually." :type 'integer :group 'url) -;;;###autoload (defun url-cookie-setup-save-timer () "Reset the cookie saver timer." (interactive) |