Commit 97702f52 authored by Lars Ingebrigtsen's avatar Lars Ingebrigtsen

Remove some XEmacs compat code from newst*.el

* lisp/net/newst-plainview.el
(newsticker--plainview-tool-bar-map): Remove XEmacs support.

* lisp/net/newst-treeview.el (newsticker-treeview-tool-bar-map):
parent f96b8fd2
......@@ -273,69 +273,67 @@ images."
;; ======================================================================
(defvar newsticker--plainview-tool-bar-map
(if (featurep 'xemacs)
nil
(if (boundp 'tool-bar-map)
(let ((tool-bar-map (make-sparse-keymap)))
(tool-bar-add-item "newsticker/prev-feed"
'newsticker-previous-feed
'newsticker-previous-feed
:help "Go to previous feed"
:enable '(newsticker-previous-feed-available-p))
(tool-bar-add-item "newsticker/prev-item"
'newsticker-previous-item
'newsticker-previous-item
:help "Go to previous item"
:enable '(newsticker-previous-item-available-p))
(tool-bar-add-item "newsticker/next-item"
'newsticker-next-item
'newsticker-next-item
:help "Go to next item"
:enable '(newsticker-next-item-available-p))
(tool-bar-add-item "newsticker/next-feed"
'newsticker-next-feed
'newsticker-next-feed
:help "Go to next feed"
:enable '(newsticker-next-feed-available-p))
(tool-bar-add-item "newsticker/narrow"
'newsticker-toggle-auto-narrow-to-feed
'newsticker-toggle-auto-narrow-to-feed
:help "Toggle visibility of other feeds")
(tool-bar-add-item "newsticker/mark-immortal"
'newsticker-mark-item-at-point-as-immortal
'newsticker-mark-item-at-point-as-immortal
:help "Mark current item as immortal"
:enable '(newsticker-item-not-immortal-p))
(tool-bar-add-item "newsticker/mark-read"
'newsticker-mark-item-at-point-as-read
'newsticker-mark-item-at-point-as-read
:help "Mark current item as read"
:enable '(newsticker-item-not-old-p))
(tool-bar-add-item "newsticker/get-all-news"
'newsticker-get-all-news
'newsticker-get-all-news
:help "Get news for all feeds")
(tool-bar-add-item "newsticker/update"
'newsticker-buffer-force-update
'newsticker-buffer-force-update
:help "Update newsticker buffer"
:enable '(not newsticker--buffer-uptodate-p))
(tool-bar-add-item "newsticker/browse-url"
'newsticker-browse-url
'newsticker-browse-url
:help "Browse URL for item at point")
;; standard icons / actions
(define-key tool-bar-map [newsticker-sep-1]
(list 'menu-item "--double-line"))
(tool-bar-add-item "close"
'newsticker-close-buffer
'newsticker-close-buffer
:help "Close newsticker buffer")
(tool-bar-add-item "preferences"
'newsticker-customize
'newsticker-customize
:help "Customize newsticker")
tool-bar-map))))
(when (boundp 'tool-bar-map)
(let ((tool-bar-map (make-sparse-keymap)))
(tool-bar-add-item "newsticker/prev-feed"
'newsticker-previous-feed
'newsticker-previous-feed
:help "Go to previous feed"
:enable '(newsticker-previous-feed-available-p))
(tool-bar-add-item "newsticker/prev-item"
'newsticker-previous-item
'newsticker-previous-item
:help "Go to previous item"
:enable '(newsticker-previous-item-available-p))
(tool-bar-add-item "newsticker/next-item"
'newsticker-next-item
'newsticker-next-item
:help "Go to next item"
:enable '(newsticker-next-item-available-p))
(tool-bar-add-item "newsticker/next-feed"
'newsticker-next-feed
'newsticker-next-feed
:help "Go to next feed"
:enable '(newsticker-next-feed-available-p))
(tool-bar-add-item "newsticker/narrow"
'newsticker-toggle-auto-narrow-to-feed
'newsticker-toggle-auto-narrow-to-feed
:help "Toggle visibility of other feeds")
(tool-bar-add-item "newsticker/mark-immortal"
'newsticker-mark-item-at-point-as-immortal
'newsticker-mark-item-at-point-as-immortal
:help "Mark current item as immortal"
:enable '(newsticker-item-not-immortal-p))
(tool-bar-add-item "newsticker/mark-read"
'newsticker-mark-item-at-point-as-read
'newsticker-mark-item-at-point-as-read
:help "Mark current item as read"
:enable '(newsticker-item-not-old-p))
(tool-bar-add-item "newsticker/get-all-news"
'newsticker-get-all-news
'newsticker-get-all-news
:help "Get news for all feeds")
(tool-bar-add-item "newsticker/update"
'newsticker-buffer-force-update
'newsticker-buffer-force-update
:help "Update newsticker buffer"
:enable '(not newsticker--buffer-uptodate-p))
(tool-bar-add-item "newsticker/browse-url"
'newsticker-browse-url
'newsticker-browse-url
:help "Browse URL for item at point")
;; standard icons / actions
(define-key tool-bar-map [newsticker-sep-1]
(list 'menu-item "--double-line"))
(tool-bar-add-item "close"
'newsticker-close-buffer
'newsticker-close-buffer
:help "Close newsticker buffer")
(tool-bar-add-item "preferences"
'newsticker-customize
'newsticker-customize
:help "Customize newsticker")
tool-bar-map)))
;; ======================================================================
;;; Newsticker mode
......
......@@ -1093,71 +1093,69 @@ Arguments are ignored."
;;; Toolbar
;; ======================================================================
(defvar newsticker-treeview-tool-bar-map
(if (featurep 'xemacs)
nil
(if (boundp 'tool-bar-map)
(let ((tool-bar-map (make-sparse-keymap)))
(tool-bar-add-item "newsticker/prev-feed"
'newsticker-treeview-prev-feed
'newsticker-treeview-prev-feed
:help "Go to previous feed"
;;:enable '(newsticker-previous-feed-available-p) FIXME
)
(tool-bar-add-item "newsticker/prev-item"
'newsticker-treeview-prev-item
'newsticker-treeview-prev-item
:help "Go to previous item"
;;:enable '(newsticker-previous-item-available-p) FIXME
)
(tool-bar-add-item "newsticker/next-item"
'newsticker-treeview-next-item
'newsticker-treeview-next-item
:visible t
:help "Go to next item"
;;:enable '(newsticker-next-item-available-p) FIXME
)
(tool-bar-add-item "newsticker/next-feed"
'newsticker-treeview-next-feed
'newsticker-treeview-next-feed
:help "Go to next feed"
;;:enable '(newsticker-next-feed-available-p) FIXME
)
(tool-bar-add-item "newsticker/mark-immortal"
'newsticker-treeview-toggle-item-immortal
'newsticker-treeview-toggle-item-immortal
:help "Toggle current item as immortal"
;;:enable '(newsticker-item-not-immortal-p) FIXME
)
(tool-bar-add-item "newsticker/mark-read"
'newsticker-treeview-mark-item-old
'newsticker-treeview-mark-item-old
:help "Mark current item as read"
;;:enable '(newsticker-item-not-old-p) FIXME
)
(tool-bar-add-item "newsticker/get-all"
'newsticker-get-all-news
'newsticker-get-all-news
:help "Get news for all feeds")
(tool-bar-add-item "newsticker/update"
'newsticker-treeview-update
'newsticker-treeview-update
:help "Update newsticker buffer")
(tool-bar-add-item "newsticker/browse-url"
'newsticker-browse-url
'newsticker-browse-url
:help "Browse URL for item at point")
;; standard icons / actions
(define-key tool-bar-map [newsticker-sep-1]
(list 'menu-item "--double-line"))
(tool-bar-add-item "close"
'newsticker-treeview-quit
'newsticker-treeview-quit
:help "Close newsticker")
(tool-bar-add-item "preferences"
'newsticker-customize
'newsticker-customize
:help "Customize newsticker")
tool-bar-map))))
(when (boundp 'tool-bar-map)
(let ((tool-bar-map (make-sparse-keymap)))
(tool-bar-add-item "newsticker/prev-feed"
'newsticker-treeview-prev-feed
'newsticker-treeview-prev-feed
:help "Go to previous feed"
;;:enable '(newsticker-previous-feed-available-p) FIXME
)
(tool-bar-add-item "newsticker/prev-item"
'newsticker-treeview-prev-item
'newsticker-treeview-prev-item
:help "Go to previous item"
;;:enable '(newsticker-previous-item-available-p) FIXME
)
(tool-bar-add-item "newsticker/next-item"
'newsticker-treeview-next-item
'newsticker-treeview-next-item
:visible t
:help "Go to next item"
;;:enable '(newsticker-next-item-available-p) FIXME
)
(tool-bar-add-item "newsticker/next-feed"
'newsticker-treeview-next-feed
'newsticker-treeview-next-feed
:help "Go to next feed"
;;:enable '(newsticker-next-feed-available-p) FIXME
)
(tool-bar-add-item "newsticker/mark-immortal"
'newsticker-treeview-toggle-item-immortal
'newsticker-treeview-toggle-item-immortal
:help "Toggle current item as immortal"
;;:enable '(newsticker-item-not-immortal-p) FIXME
)
(tool-bar-add-item "newsticker/mark-read"
'newsticker-treeview-mark-item-old
'newsticker-treeview-mark-item-old
:help "Mark current item as read"
;;:enable '(newsticker-item-not-old-p) FIXME
)
(tool-bar-add-item "newsticker/get-all"
'newsticker-get-all-news
'newsticker-get-all-news
:help "Get news for all feeds")
(tool-bar-add-item "newsticker/update"
'newsticker-treeview-update
'newsticker-treeview-update
:help "Update newsticker buffer")
(tool-bar-add-item "newsticker/browse-url"
'newsticker-browse-url
'newsticker-browse-url
:help "Browse URL for item at point")
;; standard icons / actions
(define-key tool-bar-map [newsticker-sep-1]
(list 'menu-item "--double-line"))
(tool-bar-add-item "close"
'newsticker-treeview-quit
'newsticker-treeview-quit
:help "Close newsticker")
(tool-bar-add-item "preferences"
'newsticker-customize
'newsticker-customize
:help "Customize newsticker")
tool-bar-map)))
;; ======================================================================
;;; actions
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment