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-plainview.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-plainview.el')
-rw-r--r-- | lisp/net/newst-plainview.el | 124 |
1 files changed, 61 insertions, 63 deletions
diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el index 58bca31aba4..e1e97801a04 100644 --- a/lisp/net/newst-plainview.el +++ b/lisp/net/newst-plainview.el @@ -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 |