emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: newsticker-start: Recursive laod error


From: Ulf Jasper
Subject: Re: newsticker-start: Recursive laod error
Date: Thu, 15 Dec 2005 21:18:10 +0100

OK.  I cut out the '-p' thing. The recursive load error should be fixed
now. Here's the patch

Prost!

ulf

*** newsticker.el       15 Dez 2005 19:34:02 +0100      1.8
--- newsticker.el       15 Dez 2005 20:53:51 +0100      
***************
*** 9,15 ****
  ;; URL:         http://www.nongnu.org/newsticker
  ;; Created:     17. June 2003
  ;; Keywords:    News, RSS, Atom
! ;; Time-stamp:  "1. November 2005, 21:16:53 (ulf)"
  
  ;; ======================================================================
  
--- 9,15 ----
  ;; URL:         http://www.nongnu.org/newsticker
  ;; Created:     17. June 2003
  ;; Keywords:    News, RSS, Atom
! ;; Time-stamp:  "15. Dezember 2005, 20:53:51 (ulf)"
  
  ;; ======================================================================
  
***************
*** 27,33 ****
  ;; along with this program; if not, write to the Free Software Foundation,
  ;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  
! (defconst newsticker-version "1.9" "Version number of newsticker.el.")
  
  ;; ======================================================================
  ;;; Commentary:
--- 27,33 ----
  ;; along with this program; if not, write to the Free Software Foundation,
  ;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  
! (defconst newsticker-version "1.91" "Version number of newsticker.el.")
  
  ;; ======================================================================
  ;;; Commentary:
***************
*** 169,174 ****
--- 169,181 ----
  ;; ======================================================================
  ;;; History:
  
+ ;; 1.91 (2005-12-15)
+ ;;     * Renamed `newsticker--retrieval-timer-list' to
+ ;;       `newsticker-retrieval-timer-list'.  Removed
+ ;;       `newsticker-running-p' -- check newsticker-retrieval-timer-list
+ ;;       to find out whether newsticker is running.  Removed
+ ;;       `newsticker-ticker-running-p'.
+ 
  ;; 1.9 (2005-11-01)
  ;;     * Rewrote feed parsing part.  Newsticker now supports RSS 0.91,
  ;;       0.92, 1.0, 2.0 as well as Atom 0.3 and 1.0 -- thanks to Thien-Thi
***************
*** 453,458 ****
--- 460,470 ----
        (setq element (cdr element)))
      result))
  
+ ;;;###autoload
+ (defvar newsticker-retrieval-timer-list nil
+   "List of timers for news retrieval.
+ This is an alist, each element consisting of (feed-name . timer)")
+ 
  ;; ======================================================================
  ;;; Customization
  ;; ======================================================================
***************
*** 475,488 ****
            ((memq symbol '(newsticker-url-list-defaults
                            newsticker-url-list
                            newsticker-retrieval-interval))
!            (when (and (fboundp 'newsticker-running-p)
!                       (newsticker-running-p))
               (message "Restarting newsticker")
               (newsticker-stop)
               (newsticker-start)))
            ((eq symbol 'newsticker-display-interval)
!            (when (and (fboundp 'newsticker-running-p)
!                       (newsticker-running-p))
               (message "Restarting ticker")
               (newsticker-stop-ticker)
               (newsticker-start-ticker)
--- 487,498 ----
            ((memq symbol '(newsticker-url-list-defaults
                            newsticker-url-list
                            newsticker-retrieval-interval))
!            (when newsticker-retrieval-timer-list
               (message "Restarting newsticker")
               (newsticker-stop)
               (newsticker-start)))
            ((eq symbol 'newsticker-display-interval)
!            (when newsticker-retrieval-timer-list
               (message "Restarting ticker")
               (newsticker-stop-ticker)
               (newsticker-start-ticker)
***************
*** 490,497 ****
            ((memq symbol '(newsticker-hide-old-items-in-echo-area
                            newsticker-hide-obsolete-items-in-echo-area
                            newsticker-hide-immortal-items-in-echo-area))
!            (when (and (fboundp 'newsticker-running-p)
!                       (newsticker-running-p))
               (message "Restarting newsticker")
               (newsticker-stop-ticker)
               (newsticker--ticker-text-setup)
--- 500,506 ----
            ((memq symbol '(newsticker-hide-old-items-in-echo-area
                            newsticker-hide-obsolete-items-in-echo-area
                            newsticker-hide-immortal-items-in-echo-area))
!            (when newsticker-retrieval-timer-list
               (message "Restarting newsticker")
               (newsticker-stop-ticker)
               (newsticker--ticker-text-setup)
***************
*** 1190,1198 ****
  ;; ======================================================================
  (defvar newsticker--display-timer nil
    "Timer for newsticker display.")
- (defvar newsticker--retrieval-timer-list nil
-   "List of timers for news retrieval.
- This is an alist, each element consisting of (feed-name . timer)")
  (defvar newsticker--item-list nil
    "List of newsticker items.")
  (defvar newsticker--item-position 0
--- 1199,1204 ----
***************
*** 2372,2378 ****
  DO-NOT-COMPLAIN-IF-RUNNING is not nil.
  Run `newsticker-start-hook' if newsticker was not running already."
    (interactive)
!   (let ((running (newsticker-running-p)))
      ;; read old cache if it exists and newsticker is not running
      (unless running
        (let* ((coding-system-for-read 'utf-8)
--- 2378,2384 ----
  DO-NOT-COMPLAIN-IF-RUNNING is not nil.
  Run `newsticker-start-hook' if newsticker was not running already."
    (interactive)
!   (let ((running newsticker-retrieval-interval))
      ;; read old cache if it exists and newsticker is not running
      (unless running
        (let* ((coding-system-for-read 'utf-8)
***************
*** 2393,2399 ****
                     (interval (or (nth 3 item)
                                   newsticker-retrieval-interval))
                     (timer (assoc (car item)
!                                  newsticker--retrieval-timer-list)))
                (if timer
                    (or do-not-complain-if-running
                        (message "Timer for %s is running already!"
--- 2399,2405 ----
                     (interval (or (nth 3 item)
                                   newsticker-retrieval-interval))
                     (timer (assoc (car item)
!                                  newsticker-retrieval-timer-list)))
                (if timer
                    (or do-not-complain-if-running
                        (message "Timer for %s is running already!"
***************
*** 2411,2417 ****
                  (setq timer (run-at-time start-time interval
                                           'newsticker-get-news feed-name))
                  (if interval
!                     (add-to-list 'newsticker--retrieval-timer-list
                                   (cons feed-name timer))))))
            (append newsticker-url-list-defaults newsticker-url-list))
      (unless running
--- 2417,2423 ----
                  (setq timer (run-at-time start-time interval
                                           'newsticker-get-news feed-name))
                  (if interval
!                     (add-to-list 'newsticker-retrieval-timer-list
                                   (cons feed-name timer))))))
            (append newsticker-url-list-defaults newsticker-url-list))
      (unless running
***************
*** 2438,2448 ****
    (interactive)
    (newsticker--cache-update t)
    (newsticker-stop-ticker)
!   (when (newsticker-running-p)
      (mapc (lambda (name-and-timer)
              (cancel-timer (cdr name-and-timer)))
!           newsticker--retrieval-timer-list)
!     (setq newsticker--retrieval-timer-list nil)
      (run-hooks 'newsticker-stop-hook)
      (message "Newsticker stopped!")))
  
--- 2444,2454 ----
    (interactive)
    (newsticker--cache-update t)
    (newsticker-stop-ticker)
!   (when newsticker-retrieval-timer-list
      (mapc (lambda (name-and-timer)
              (cancel-timer (cdr name-and-timer)))
!           newsticker-retrieval-timer-list)
!     (setq newsticker-retrieval-timer-list nil)
      (run-hooks 'newsticker-stop-hook)
      (message "Newsticker stopped!")))
  
***************
*** 3079,3102 ****
            (and (memq  age '(new old obsolete)) t)))))
  
  ;; ======================================================================
- ;;; Newsticker status
- ;; ======================================================================
- ;;;###autoload
- (defun newsticker-running-p ()
-   "Check whether newsticker is running.
- Return t if newsticker is running, nil otherwise.  Newsticker is
- considered to be running if the newsticker timer list is not empty."
-   (> (length newsticker--retrieval-timer-list) 0))
- 
- ;;;###autoload
- (defun newsticker-ticker-running-p ()
-   "Check whether newsticker's actual ticker is running.
- Return t if ticker is running, nil otherwise.  Newsticker is
- considered to be running if the newsticker timer list is not
- empty."
-   (timerp newsticker--display-timer))
- 
- ;; ======================================================================
  ;;; local stuff
  ;; ======================================================================
  (defun newsticker-get-news (feed-name)
--- 3085,3090 ----




reply via email to

[Prev in Thread] Current Thread [Next in Thread]