Merge from trunk.

[gnu-emacs] / lisp / net / newst-ticker.el

diff --git a/lisp/net/newst-ticker.el b/lisp/net/newst-ticker.el
index ea19e7bbace0a72cf1483290edebe76117a2157f..e62dd284f7acc1ff2549a1ffd58610dbbbab0525 100644 (file)
--- a/lisp/net/newst-ticker.el
+++ b/lisp/net/newst-ticker.el
@@ -1,13 +1,13 @@
 ;; newst-ticker.el --- modeline ticker for newsticker.
 
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2003-2012  Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; 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)"
+;; Package:     newsticker
 
 ;; ======================================================================
 
@@ -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,6 @@ 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