[Emacs-diffs] Changes to emacs/lisp/net/newsticker-plainview.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/06/10 03:08:37

Index: newsticker-plainview.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/newsticker-plainview.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- newsticker-plainview.el     8 Jun 2008 18:44:20 -0000       1.3
+++ newsticker-plainview.el     10 Jun 2008 03:08:37 -0000      1.4
@@ -8,7 +8,7 @@
 ;; Filename:    newsticker-plainview.el
 ;; URL:         http://www.nongnu.org/newsticker
 ;; Time-stamp:  "8. Juni 2008, 20:39:46 (ulf)"
-;; CVS-Version: $Id: newsticker-plainview.el,v 1.3 2008/06/08 18:44:20 u11 Exp 
$
+;; CVS-Version: $Id: newsticker-plainview.el,v 1.4 2008/06/10 03:08:37 gm Exp $
 
 ;; ======================================================================
 
@@ -39,7 +39,6 @@
 (require 'xml)
 
 ;; Silence warnings
-(defvar tool-bar-map)
 (defvar w3-mode-map)
 (defvar w3m-minor-mode-map)
 
@@ -326,6 +325,7 @@
 (defvar newsticker--plainview-tool-bar-map
   (if (featurep 'xemacs)
       nil
+    (if (boundp 'tool-bar-map)
     (let ((tool-bar-map (make-sparse-keymap)))
       (define-key tool-bar-map [newsticker-sep-1]
         (list 'menu-item "--double-line"))
@@ -399,7 +399,7 @@
                          'newsticker-customize
                          'newsticker-customize
                          :help "Customize newsticker")
-      tool-bar-map)))
+          tool-bar-map))))
 
 ;; ======================================================================
 ;;; Newsticker mode
@@ -408,7 +408,9 @@
 (define-derived-mode newsticker-mode fundamental-mode
   "NewsTicker"
   "Viewing news feeds in Emacs."
-  (set (make-local-variable 'tool-bar-map) newsticker--plainview-tool-bar-map)
+  (if (boundp 'tool-bar-map)
+      (set (make-local-variable 'tool-bar-map)
+           newsticker--plainview-tool-bar-map))
   (set (make-local-variable 'imenu-sort-function) nil)
   (set (make-local-variable 'scroll-conservatively) 999)
   (setq imenu-create-index-function 'newsticker--imenu-create-index)
@@ -620,6 +622,8 @@
         (newsticker--debug-msg "Getting news for %s" (symbol-name feed))
         (newsticker-get-news (symbol-name feed)))))
 
+(declare-function w3m-toggle-inline-image "ext:w3m" (&optional force no-cache))
+
 (defun newsticker-w3m-show-inline-images ()
   "Show inline images in visible text ranges.
 In-line images in invisible text ranges are hidden.  This function