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

[Richard M . Stallman]

Index: emacs/lisp/url/url-history.el
diff -c emacs/lisp/url/url-history.el:1.12 emacs/lisp/url/url-history.el:1.13
*** emacs/lisp/url/url-history.el:1.12  Thu Dec  1 21:45:21 2005
--- emacs/lisp/url/url-history.el       Sun Dec  4 17:53:02 2005
***************
*** 63,76 ****
  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))))
    :type 'integer
    :group 'url-history)
  
--- 63,72 ----
  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 #'(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,111 ****
    "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))))
    (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))))))
  
  ;;;###autoload
  (defun url-history-parse-history (&optional fname)
--- 88,99 ----
    "Reset the history list timer."
    (interactive)
    (ignore-errors
!    (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 (run-at-time url-history-save-interval
!                                          url-history-save-interval
!                                          'url-history-save-history))))
  
  ;;;###autoload
  (defun url-history-parse-history (&optional fname)