[Emacs-diffs] Changes to emacs/lisp/url/url-cookie.el

[Richard M . Stallman]

Index: emacs/lisp/url/url-cookie.el
diff -c emacs/lisp/url/url-cookie.el:1.14 emacs/lisp/url/url-cookie.el:1.15
*** emacs/lisp/url/url-cookie.el:1.14   Sat Aug  6 15:55:38 2005
--- emacs/lisp/url/url-cookie.el        Thu Dec  8 00:01:35 2005
***************
*** 449,459 ****
  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))))
    :type 'integer
    :group 'url)
  
--- 449,458 ----
  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 #'(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,481 ****
  (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))))
    (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))))))
  
  (provide 'url-cookie)
  
--- 460,471 ----
  (defun url-cookie-setup-save-timer ()
    "Reset the cookie saver timer."
    (interactive)
!   (ignore-errors (cancel-timer url-cookie-timer))
    (setq url-cookie-timer nil)
    (if 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)