(url-history-list): Var deleted.

(url-history-save-interval): Simplify.
(url-history-setup-save-timer): Simplify.

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 61735a06b0bb46d3630f2db11038098324a49a25..626661e6f7d2555ed16e78c1ec09526d67a001da 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-04  Klaus Straubinger  <KSNetz@Arcor.DE>  (tiny change)
+
+       * url-history.el (url-history-list): Var deleted.
+       (url-history-save-interval): Simplify.
+       (url-history-setup-save-timer): Simplify.
+
 2005-12-01  Kim F. Storm  <storm@cua.dk>
 
        * url-history.el (url-history-track): Fix last change.

diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el
index eb7d7a461443fc3ecb7ebca2eac821e1b4db208f..8e939d7e39aa82e358ac699625ec0fe50a9d629a 100644 (file)
--- a/lisp/url/url-history.el
+++ b/lisp/url/url-history.el
@@ -63,14 +63,10 @@ is parsed at startup and used to provide URL completion."
 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 @@ to run the `url-history-setup-save-timer' function manually."
   "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)