From 8e39154d85464b64d3afbf1c83d553e101e6cb32 Mon Sep 17 00:00:00 2001 From: Ulf Jasper Date: Sun, 6 Dec 2009 19:49:04 +0000 Subject: [PATCH] Fixed Bug#5096. --- lisp/ChangeLog | 10 ++++++++++ lisp/net/newst-backend.el | 4 ++-- lisp/net/newst-plainview.el | 8 ++++---- lisp/net/newst-reader.el | 6 +++--- lisp/net/newst-ticker.el | 6 +++--- lisp/net/newst-treeview.el | 6 +++--- lisp/net/newsticker.el | 12 ++++++------ 7 files changed, 31 insertions(+), 21 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c8b11dd1deb..a8c4a0ceec9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2009-12-06 Ulf Jasper + + * net/newst-backend.el : + * net/newst-plainview.el: + * net/newst-reader.el: + * net/newst-ticker.el: + * net/newst-treeview.el: + * net/newsticker.el: Require/provide newst-... (instead of + newsticker-...). (Bug#5096) + 2009-12-06 Chong Yidong * simple.el (beginning-of-visual-line): Constrain to field diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el index ae028516fb8..008c2215652 100644 --- a/lisp/net/newst-backend.el +++ b/lisp/net/newst-backend.el @@ -7,7 +7,7 @@ ;; Filename: newst-backend.el ;; URL: http://www.nongnu.org/newsticker ;; Keywords: News, RSS, Atom -;; Time-stamp: "5. Dezember 2009, 13:21:27 (ulf)" +;; Time-stamp: "6. Dezember 2009, 19:15:32 (ulf)" ;; ====================================================================== @@ -2350,7 +2350,7 @@ This function is suited for adding it to `newsticker-new-item-functions'." "" (format "Or maybe it is %d" (random 10000)) "")) -(provide 'newsticker-backend) +(provide 'newst-backend) ;; arch-tag: 0e37b658-56e9-49ab-90f9-f2df57e1a659 ;;; newst-backend.el ends here diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el index a6c120876e0..b2b88c12aa0 100644 --- a/lisp/net/newst-plainview.el +++ b/lisp/net/newst-plainview.el @@ -6,7 +6,7 @@ ;; Author: Ulf Jasper ;; Filename: newst-plainview.el ;; URL: http://www.nongnu.org/newsticker -;; Time-stamp: "13. Oktober 2008, 20:34:21 (ulf)" +;; Time-stamp: "6. Dezember 2009, 19:17:02 (ulf)" ;; ====================================================================== @@ -33,8 +33,8 @@ ;; ====================================================================== ;;; Code: -(require 'newsticker-ticker "newst-ticker") -(require 'newsticker-reader "newst-reader") +(require 'newst-ticker) +(require 'newst-reader) (require 'derived) (require 'xml) @@ -1797,7 +1797,7 @@ Take care: end of item is at the end of its last line!" sort-fun))) newsticker--cache))) -(provide 'newsticker-plainview) +(provide 'newst-plainview) ;; arch-tag: 4e48b683-d48b-48dd-a13e-fe45baf41184 ;;; newst-plainview.el ends here diff --git a/lisp/net/newst-reader.el b/lisp/net/newst-reader.el index c755578de56..a69620496bf 100644 --- a/lisp/net/newst-reader.el +++ b/lisp/net/newst-reader.el @@ -6,7 +6,7 @@ ;; Author: Ulf Jasper ;; Filename: newst-reader.el ;; URL: http://www.nongnu.org/newsticker -;; Time-stamp: "18. November 2008, 20:06:13 (ulf)" +;; Time-stamp: "6. Dezember 2009, 19:16:38 (ulf)" ;; ====================================================================== @@ -33,7 +33,7 @@ ;; ====================================================================== ;;; Code: -(require 'newsticker-backend "newst-backend") +(require 'newst-backend) ;; ====================================================================== ;;; Customization @@ -1178,7 +1178,7 @@ static char * visit_xpm[] = { (insert "")) (browse-url t-file))) -(provide 'newsticker-reader) +(provide 'newst-reader) ;; arch-tag: c604b701-bdf1-4fc1-8d05-5fabd1939533 ;;; newst-reader.el ends here diff --git a/lisp/net/newst-ticker.el b/lisp/net/newst-ticker.el index e9c97941f89..3c807d70547 100644 --- a/lisp/net/newst-ticker.el +++ b/lisp/net/newst-ticker.el @@ -7,7 +7,7 @@ ;; Filename: newst-ticker.el ;; URL: http://www.nongnu.org/newsticker ;; Keywords: News, RSS, Atom -;; Time-stamp: "13. Juni 2008, 19:28:50 (ulf)" +;; Time-stamp: "6. Dezember 2009, 19:16:00 (ulf)" ;; ====================================================================== @@ -35,7 +35,7 @@ ;; ====================================================================== ;;; Code: -(require 'newsticker-backend "newst-backend") +(require 'newst-backend) (defvar newsticker--ticker-timer nil "Timer for newsticker ticker.") @@ -287,7 +287,7 @@ running already." newsticker--scrollable-text) (setq newsticker--scrollable-text "")))) -(provide 'newsticker-ticker) +(provide 'newst-ticker) ;; arch-tag: faee3ebb-749b-4935-9835-7f36d4b700f0 ;;; newst-ticker.el ends here diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el index cc70dfc6347..8966a6233a9 100644 --- a/lisp/net/newst-treeview.el +++ b/lisp/net/newst-treeview.el @@ -7,7 +7,7 @@ ;; URL: http://www.nongnu.org/newsticker ;; Created: 2007 ;; Keywords: News, RSS, Atom -;; Time-stamp: "4. Dezember 2009, 20:07:40 (ulf)" +;; Time-stamp: "6. Dezember 2009, 19:17:28 (ulf)" ;; ====================================================================== @@ -38,7 +38,7 @@ ;; ====================================================================== ;;; Code: -(require 'newsticker-reader "newst-reader") +(require 'newst-reader) (require 'widget) (require 'tree-widget) (require 'wid-edit) @@ -2073,7 +2073,7 @@ POS gives the position where EVENT occurred." (when newsticker--treeview-current-feed (newsticker-get-news newsticker--treeview-current-feed))) -(provide 'newsticker-treeview) +(provide 'newst-treeview) ;; arch-tag: 5dbaff48-1f3e-4fc6-8ebd-e966fc90d2d4 ;;; newst-treeview.el ends here diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el index 16ece444dc1..3d430d116c0 100644 --- a/lisp/net/newsticker.el +++ b/lisp/net/newsticker.el @@ -8,7 +8,7 @@ ;; URL: http://www.nongnu.org/newsticker ;; Created: 17. June 2003 ;; Keywords: News, RSS, Atom -;; Time-stamp: "13. Juni 2008, 17:46:44 (ulf)" +;; Time-stamp: "6. Dezember 2009, 19:15:18 (ulf)" ;; ====================================================================== @@ -400,11 +400,11 @@ ;; ====================================================================== ;;; Code: -(require 'newsticker-backend "newst-backend.el") -(require 'newsticker-ticker "newst-ticker.el") -(require 'newsticker-reader "newst-reader.el") -(require 'newsticker-plainview "newst-plainview.el") -(require 'newsticker-treeview "newst-treeview.el") +(require 'newst-backend) +(require 'newst-ticker) +(require 'newst-reader) +(require 'newst-plainview) +(require 'newst-treeview) (provide 'newsticker)