diff options
| author | Richard M. Stallman <[email protected]> | 2005-12-04 17:53:13 +0000 |
|---|---|---|
| committer | Richard M. Stallman <[email protected]> | 2005-12-04 17:53:13 +0000 |
| commit | 8553120c7027745489c4d275b77451000ffeec14 (patch) | |
| tree | 7ce8023403487dec9f4b791ab625cbf836a79885 | |
| parent | 67afa80d6230ea08df956336c6be37c02d8280dc (diff) | |
(url-history-list): Var deleted.
(url-history-save-interval): Simplify.
(url-history-setup-save-timer): Simplify.
| -rw-r--r-- | lisp/url/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/url/url-history.el | 28 |
2 files changed, 14 insertions, 20 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 61735a06b0..626661e6f7 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,9 @@ +2005-12-04 Klaus Straubinger <[email protected]> (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 <[email protected]> * url-history.el (url-history-track): Fix last change. diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el index eb7d7a4614..8e939d7e39 100644 --- 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) |