Merge from emacs-24

[gnu-emacs] / lisp / net / newsticker.el

diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el
index 16ece444dc16b8ee7a10cce68a296ca800feadc7..5d673faf0db03c4c821c5cdee066766d9b610918 100644 (file)
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -1,14 +1,14 @@
 ;;; newsticker.el --- A Newsticker for Emacs.
 
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2003-2012  Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newsticker.el
 ;; 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)"
+;; Version:     1.99
 
 ;; ======================================================================
 
@@ -103,10 +103,10 @@
 ;; -----
 ;; The command newsticker-show-news will display all available headlines in
 ;; a special buffer, called `*newsticker*'.  It will also start the
-;; asynchronous download of headlines.  The modeline in the `*newsticker*'
+;; asynchronous download of headlines.  The mode line in the `*newsticker*'
 ;; buffer informs whenever new headlines have arrived.  Clicking
 ;; mouse-button 2 or pressing RET in this buffer on a headline will call
-;; browse-url to load the corresponding news story in your favourite web
+;; browse-url to load the corresponding news story in your favorite web
 ;; browser.
 
 ;; The scrolling, or flashing of headlines in the echo area, can be started
@@ -400,13 +400,12 @@
 ;; ======================================================================
 ;;; 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)
 
-;; arch-tag: ab761dfa-67bc-4207-bc64-4307271dc381
 ;;; newsticker.el ends here