# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1133718782 0
# Node ID e6faadb772182ae8404b94c5e26b6aebd9e801ff
# Parent  ee8894ca3f649ba368bd4f1bd7b63139116dd4ea
(url-history-list): Var deleted.
(url-history-save-interval): Simplify.
(url-history-setup-save-timer): Simplify.

diff -r ee8894ca3f64 -r e6faadb77218 lisp/url/url-history.el
--- a/lisp/url/url-history.el	Sun Dec 04 09:12:07 2005 +0000
+++ b/lisp/url/url-history.el	Sun Dec 04 17:53:02 2005 +0000
@@ -63,14 +63,10 @@
 Default is 1 hour.  Note that if you change this variable outside of
 the `customize' interface after `url-do-setup' has been run, you need
 to run the `url-history-setup-save-timer' function manually."
-  :set (function (lambda (var val)
-		   (set-default var val)
-		   (and (featurep 'url)
-			(fboundp 'url-history-setup-save-timer)
-                        (let ((def (symbol-function
-                                    'url-history-setup-save-timer)))
-                          (not (and (listp def) (eq 'autoload (car def)))))
-			(url-history-setup-save-timer))))
+  :set #'(lambda (var val)
+	   (set-default var val)
+	   (if (bound-and-true-p url-setup-done)
+	       (url-history-setup-save-timer)))
   :type 'integer
   :group 'url-history)
 
@@ -92,20 +88,12 @@
   "Reset the history list timer."
   (interactive)
   (ignore-errors
-    (cond ((fboundp 'cancel-timer) (cancel-timer url-history-timer))
-	  ((fboundp 'delete-itimer) (delete-itimer url-history-timer))))
+   (cancel-timer url-history-timer))
   (setq url-history-timer nil)
   (if (and (eq url-history-track t) url-history-save-interval)
-      (setq url-history-timer
-	    (cond
-	     ((fboundp 'run-at-time)
-	      (run-at-time url-history-save-interval
-			   url-history-save-interval
-			   'url-history-save-history))
-	     ((fboundp 'start-itimer)
-	      (start-itimer "url-history-saver" 'url-history-save-history
-			    url-history-save-interval
-			    url-history-save-interval))))))
+      (setq url-history-timer (run-at-time url-history-save-interval
+					   url-history-save-interval
+					   'url-history-save-history))))
 
 ;;;###autoload
 (defun url-history-parse-history (&optional fname)