From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 5 Jan 2006 22:07:30 +0000 (+0000)
Subject: (url-history-parse-history): Don't complain if the file is missing.
X-Git-Tag: emacs-pretest-22.0.90~4865
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ce0c92e1f319ea55cdc414b3972836138ce39731;p=emacs.git

(url-history-parse-history): Don't complain if the file is missing.
(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.
---

diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el
index 3bb7145b451..8ed9f1d8171 100644
--- a/lisp/url/url-history.el
+++ b/lisp/url/url-history.el
@@ -1,7 +1,7 @@
 ;;; url-history.el --- Global history tracking for URL package
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -80,7 +80,6 @@ to run the `url-history-setup-save-timer' function manually."
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;;;###autoload
 (defun url-history-setup-save-timer ()
   "Reset the history list timer."
   (interactive)
@@ -92,14 +91,15 @@ to run the `url-history-setup-save-timer' function manually."
 					   url-history-save-interval
 					   'url-history-save-history))))
 
-;;;###autoload
 (defun url-history-parse-history (&optional fname)
   "Parse a history file stored in FNAME."
   ;; Parse out the mosaic global history file for completions, etc.
   (or fname (setq fname (expand-file-name url-history-file)))
   (cond
    ((not (file-exists-p fname))
-    (message "%s does not exist." fname))
+    ;; It's completely normal for this file not to exist, so don't complain.
+    ;; (message "%s does not exist." fname)
+    )
    ((not (file-readable-p fname))
     (message "%s is unreadable." fname))
    (t
@@ -113,7 +113,6 @@ to run the `url-history-setup-save-timer' function manually."
   (setq url-history-changed-since-last-save t)
   (puthash (if (vectorp url) (url-recreate-url url) url) time url-history-hash-table))
 
-;;;###autoload
 (defun url-history-save-history (&optional fname)
   "Write the global history file into `url-history-file'.
 The type of data written is determined by what is in the file to begin