1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-02 11:21:42 +00:00

(w3m-toggle-inline-images): Declare.

(newsticker-treeview-tool-bar-map, newsticker-treeview-mode):
Check tool-bar-map is bound, for non-X builds.
This commit is contained in:
Glenn Morris 2008-06-10 03:08:14 +00:00
parent cf99cd0480
commit a66bb4d5fe

View File

@ -10,7 +10,7 @@
;; Created: 2007 ;; Created: 2007
;; Keywords: News, RSS, Atom ;; Keywords: News, RSS, Atom
;; Time-stamp: "8. Juni 2008, 20:42:16 (ulf)" ;; Time-stamp: "8. Juni 2008, 20:42:16 (ulf)"
;; CVS-Version: $Id: newsticker-treeview.el,v 1.2 2008/06/08 18:09:06 miles Exp $ ;; CVS-Version: $Id: newsticker-treeview.el,v 1.3 2008/06/08 18:44:20 u11 Exp $
;; ====================================================================== ;; ======================================================================
@ -250,6 +250,8 @@ their id stays constant."
;; ====================================================================== ;; ======================================================================
(declare-function w3m-toggle-inline-images "ext:w3m" (&optional force no-cache))
(defun newsticker--treeview-render-text (start end) (defun newsticker--treeview-render-text (start end)
"Render text between markers START and END." "Render text between markers START and END."
(if newsticker-html-renderer (if newsticker-html-renderer
@ -1046,90 +1048,91 @@ Arguments IGNORE are ignored."
(defvar newsticker-treeview-tool-bar-map (defvar newsticker-treeview-tool-bar-map
(if (featurep 'xemacs) (if (featurep 'xemacs)
nil nil
(let ((tool-bar-map (make-sparse-keymap))) (if (boundp 'tool-bar-map)
(define-key tool-bar-map [newsticker-sep-1] (let ((tool-bar-map (make-sparse-keymap)))
(list 'menu-item "--double-line")) (define-key tool-bar-map [newsticker-sep-1]
(define-key tool-bar-map [newsticker-browse-url] (list 'menu-item "--double-line"))
(list 'menu-item "newsticker-browse-url" (define-key tool-bar-map [newsticker-browse-url]
'newsticker-browse-url (list 'menu-item "newsticker-browse-url"
:visible t 'newsticker-browse-url
:help "Browse URL for item at point" :visible t
:image newsticker--browse-image)) :help "Browse URL for item at point"
(define-key tool-bar-map [newsticker-buffer-force-update] :image newsticker--browse-image))
(list 'menu-item "newsticker-treeview-update" (define-key tool-bar-map [newsticker-buffer-force-update]
'newsticker-treeview-update (list 'menu-item "newsticker-treeview-update"
:visible t 'newsticker-treeview-update
:help "Update newsticker buffer" :visible t
:image newsticker--update-image :help "Update newsticker buffer"
:enable t)) :image newsticker--update-image
(define-key tool-bar-map [newsticker-get-all-news] :enable t))
(list 'menu-item "newsticker-get-all-news" 'newsticker-get-all-news (define-key tool-bar-map [newsticker-get-all-news]
:visible t (list 'menu-item "newsticker-get-all-news" 'newsticker-get-all-news
:help "Get news for all feeds" :visible t
:image newsticker--get-all-image)) :help "Get news for all feeds"
(define-key tool-bar-map [newsticker-mark-item-at-point-as-read] :image newsticker--get-all-image))
(list 'menu-item "newsticker-treeview-mark-item-old" (define-key tool-bar-map [newsticker-mark-item-at-point-as-read]
'newsticker-treeview-mark-item-old (list 'menu-item "newsticker-treeview-mark-item-old"
:visible t 'newsticker-treeview-mark-item-old
:image newsticker--mark-read-image :visible t
:help "Mark current item as read" :image newsticker--mark-read-image
;;:enable '(newsticker-item-not-old-p) FIXME :help "Mark current item as read"
)) ;;:enable '(newsticker-item-not-old-p) FIXME
(define-key tool-bar-map [newsticker-mark-item-at-point-as-immortal] ))
(list 'menu-item "newsticker-treeview-toggle-item-immortal" (define-key tool-bar-map [newsticker-mark-item-at-point-as-immortal]
'newsticker-treeview-toggle-item-immortal (list 'menu-item "newsticker-treeview-toggle-item-immortal"
:visible t 'newsticker-treeview-toggle-item-immortal
:image newsticker--mark-immortal-image :visible t
:help "Toggle current item as immortal" :image newsticker--mark-immortal-image
:enable t :help "Toggle current item as immortal"
;;'(newsticker-item-not-immortal-p) FIXME :enable t
)) ;;'(newsticker-item-not-immortal-p) FIXME
(define-key tool-bar-map [newsticker-next-feed] ))
(list 'menu-item "newsticker-treeview-next-feed" (define-key tool-bar-map [newsticker-next-feed]
'newsticker-treeview-next-feed (list 'menu-item "newsticker-treeview-next-feed"
:visible t 'newsticker-treeview-next-feed
:help "Go to next feed" :visible t
:image newsticker--next-feed-image :help "Go to next feed"
:enable t :image newsticker--next-feed-image
;;'(newsticker-next-feed-available-p) FIXME :enable t
)) ;;'(newsticker-next-feed-available-p) FIXME
(define-key tool-bar-map [newsticker-treeview-next-item] ))
(list 'menu-item "newsticker-treeview-next-item" (define-key tool-bar-map [newsticker-treeview-next-item]
'newsticker-treeview-next-item (list 'menu-item "newsticker-treeview-next-item"
:visible t 'newsticker-treeview-next-item
:help "Go to next item" :visible t
:image newsticker--next-item-image :help "Go to next item"
:enable t :image newsticker--next-item-image
;;'(newsticker-next-item-available-p) FIXME :enable t
)) ;;'(newsticker-next-item-available-p) FIXME
(define-key tool-bar-map [newsticker-treeview-prev-item] ))
(list 'menu-item "newsticker-treeview-prev-item" (define-key tool-bar-map [newsticker-treeview-prev-item]
'newsticker-treeview-prev-item (list 'menu-item "newsticker-treeview-prev-item"
:visible t 'newsticker-treeview-prev-item
:help "Go to previous item" :visible t
:image newsticker--previous-item-image :help "Go to previous item"
:enable t :image newsticker--previous-item-image
;;'(newsticker-previous-item-available-p) FIXME :enable t
)) ;;'(newsticker-previous-item-available-p) FIXME
(define-key tool-bar-map [newsticker-treeview-prev-feed] ))
(list 'menu-item "newsticker-treeview-prev-feed" (define-key tool-bar-map [newsticker-treeview-prev-feed]
'newsticker-treeview-prev-feed (list 'menu-item "newsticker-treeview-prev-feed"
:visible t 'newsticker-treeview-prev-feed
:help "Go to previous feed" :visible t
:image newsticker--previous-feed-image :help "Go to previous feed"
:enable t :image newsticker--previous-feed-image
;;'(newsticker-previous-feed-available-p) FIXME :enable t
)) ;;'(newsticker-previous-feed-available-p) FIXME
;; standard icons / actions ))
(tool-bar-add-item "close" ;; standard icons / actions
'newsticker-treeview-quit (tool-bar-add-item "close"
'newsticker-treeview-quit 'newsticker-treeview-quit
:help "Close newsticker") 'newsticker-treeview-quit
(tool-bar-add-item "preferences" :help "Close newsticker")
'newsticker-customize (tool-bar-add-item "preferences"
'newsticker-customize 'newsticker-customize
:help "Customize newsticker") 'newsticker-customize
tool-bar-map))) :help "Customize newsticker")
tool-bar-map))))
;; ====================================================================== ;; ======================================================================
;;; actions ;;; actions
@ -1862,7 +1865,9 @@ Remove obsolete feeds as well."
(use-local-map newsticker-treeview-mode-map) (use-local-map newsticker-treeview-mode-map)
(setq major-mode 'newsticker-treeview-mode) (setq major-mode 'newsticker-treeview-mode)
(setq mode-name "Newsticker TV") (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 (setq buffer-read-only t
truncate-lines t)) truncate-lines t))