From 0c069924416e0c93c4f5ae9cb82abc870adc40de Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 8 Dec 2005 00:01:48 +0000 Subject: [PATCH] (url-cookie-save-interval): Simplify. (url-cookie-setup-save-timer): Simplify. --- lisp/url/ChangeLog | 5 +++++ lisp/url/url-cookie.el | 26 ++++++++------------------ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 626661e6f7d..81ba66736b0 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,8 @@ +2005-12-07 Klaus Straubinger (tiny change) + + * url-cookie.el (url-cookie-save-interval): Simplify. + (url-cookie-setup-save-timer): Simplify. + 2005-12-04 Klaus Straubinger (tiny change) * url-history.el (url-history-list): Var deleted. diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el index 618f89e60e9..480a16c204d 100644 --- a/lisp/url/url-cookie.el +++ b/lisp/url/url-cookie.el @@ -449,11 +449,10 @@ telling Microsoft that." 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-cookie-setup-save-timer' function manually." - :set (function (lambda (var val) - (set-default var val) - (and (featurep 'url) - (fboundp 'url-cookie-setup-save-timer) - (url-cookie-setup-save-timer)))) + :set #'(lambda (var val) + (set-default var val) + (if (bound-and-true-p url-setup-done) + (url-cookie-setup-save-timer))) :type 'integer :group 'url) @@ -461,21 +460,12 @@ to run the `url-cookie-setup-save-timer' function manually." (defun url-cookie-setup-save-timer () "Reset the cookie saver timer." (interactive) - (ignore-errors - (cond ((fboundp 'cancel-timer) (cancel-timer url-cookie-timer)) - ((fboundp 'delete-itimer) (delete-itimer url-cookie-timer)))) + (ignore-errors (cancel-timer url-cookie-timer)) (setq url-cookie-timer nil) (if url-cookie-save-interval - (setq url-cookie-timer - (cond - ((fboundp 'run-at-time) - (run-at-time url-cookie-save-interval - url-cookie-save-interval - 'url-cookie-write-file)) - ((fboundp 'start-itimer) - (start-itimer "url-cookie-saver" 'url-cookie-write-file - url-cookie-save-interval - url-cookie-save-interval)))))) + (setq url-cookie-timer (run-at-time url-cookie-save-interval + url-cookie-save-interval + #'url-cookie-write-file)))) (provide 'url-cookie) -- 2.39.2