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

[Glenn Morris]

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

Index: newsticker-treeview.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/newsticker-treeview.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- newsticker-treeview.el      8 Jun 2008 18:44:20 -0000       1.3
+++ newsticker-treeview.el      10 Jun 2008 03:08:14 -0000      1.4
@@ -10,7 +10,7 @@
 ;; Created:     2007
 ;; Keywords:    News, RSS, Atom
 ;; Time-stamp:  "8. Juni 2008, 20:42:16 (ulf)"
-;; CVS-Version: $Id: newsticker-treeview.el,v 1.3 2008/06/08 18:44:20 u11 Exp $
+;; CVS-Version: $Id: newsticker-treeview.el,v 1.4 2008/06/10 03:08:14 gm Exp $
 
 ;; ======================================================================
 
@@ -250,6 +250,8 @@
 
 ;; ======================================================================
 
+(declare-function w3m-toggle-inline-images "ext:w3m" (&optional force 
no-cache))
+
 (defun newsticker--treeview-render-text (start end)
   "Render text between markers START and END."
   (if newsticker-html-renderer
@@ -1046,6 +1048,7 @@
 (defvar newsticker-treeview-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"))
@@ -1129,7 +1132,7 @@
                          'newsticker-customize
                          'newsticker-customize
                          :help "Customize newsticker")
-      tool-bar-map)))
+          tool-bar-map))))
 
 ;; ======================================================================
 ;;; actions
@@ -1862,7 +1865,9 @@
   (use-local-map newsticker-treeview-mode-map)
   (setq major-mode 'newsticker-treeview-mode)
   (setq mode-name "Newsticker TV")
-  (set (make-local-variable 'tool-bar-map) newsticker-treeview-tool-bar-map)
+  (if (boundp 'tool-bar-map)
+      (set (make-local-variable 'tool-bar-map)
+           newsticker-treeview-tool-bar-map))
   (setq buffer-read-only t
         truncate-lines t))