diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-10-09 02:46:17 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-10-09 02:46:17 +0200 |
| commit | 97702f5292307c71c9c124604bf85b6c629f3bb6 (patch) | |
| tree | 20f6d1b707c4eaf6e27c554ea07bf0d453397208 /lisp/net/newst-treeview.el | |
| parent | f96b8fd27c382a941c52c2938544b9b0e3a2fb0e (diff) | |
| download | emacs-97702f5292307c71c9c124604bf85b6c629f3bb6.tar.gz | |
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):
Diffstat (limited to 'lisp/net/newst-treeview.el')
| -rw-r--r-- | lisp/net/newst-treeview.el | 128 |
1 files changed, 63 insertions, 65 deletions
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el index ece728a8358..2a6a64de461 100644 --- a/lisp/net/newst-treeview.el +++ b/lisp/net/newst-treeview.el @@ -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 |