Merge from mainline.

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

diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el
index 49bae4fae652a05c641f0dca821f7d2c101bda5d..e1bdc2cade23656a406313a3d47eaced5d041d84 100644 (file)
--- a/lisp/net/newst-plainview.el
+++ b/lisp/net/newst-plainview.el
@@ -1,12 +1,12 @@
 ;;; newst-plainview.el --- Single buffer frontend for newsticker.
 
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newst-plainview.el
 ;; URL:         http://www.nongnu.org/newsticker
-;; Time-stamp:  "15. Juni 2008, 09:41:55 (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)
 
@@ -595,6 +595,7 @@ This does NOT start the retrieval timers."
         (newsticker--debug-msg "Getting news for %s" (symbol-name feed))
         (newsticker-get-news (symbol-name feed)))))
 
+(unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
 (declare-function w3m-toggle-inline-image "ext:w3m" (&optional force no-cache))
 
 (defun newsticker-w3m-show-inline-images ()
@@ -1209,11 +1210,10 @@ The mode-line is changed accordingly."
   (setq newsticker--buffer-uptodate-p value)
   (let ((b (get-buffer "*newsticker*")))
     (when b
-      (save-excursion
-       (set-buffer b)
-       (if value
-           (setq mode-name "Newsticker -- up to date -- ")
-         (setq mode-name "Newsticker -- NEED UPDATE -- ")))
+      (with-current-buffer b
+        (setq mode-name (if value
+                            "Newsticker -- up to date -- "
+                          "Newsticker -- NEED UPDATE -- ")))
       (force-mode-line-update 0))))
 
 (defun newsticker--buffer-redraw ()
@@ -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