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):
author: Lars Ingebrigtsen 2019-10-09 02:46:17 +0200
committer: Lars Ingebrigtsen 2019-10-09 02:46:17 +0200
commit: 97702f5292307c71c9c124604bf85b6c629f3bb6 (patch)
tree: 20f6d1b707c4eaf6e27c554ea07bf0d453397208
parent: f96b8fd27c382a941c52c2938544b9b0e3a2fb0e (diff)
download: emacs-97702f5292307c71c9c124604bf85b6c629f3bb6.tar.gz
emacs-97702f5292307c71c9c124604bf85b6c629f3bb6.zip
2 files changed, 124 insertions, 128 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)
+  (when (boundp 'tool-bar-map)
-      nil
+    (let ((tool-bar-map (make-sparse-keymap)))
-    (if (boundp 'tool-bar-map)
+      (tool-bar-add-item "newsticker/prev-feed"
-        (let ((tool-bar-map (make-sparse-keymap)))
+                         'newsticker-previous-feed
-          (tool-bar-add-item "newsticker/prev-feed"
+                         'newsticker-previous-feed
-                             'newsticker-previous-feed
+                         :help "Go to previous feed"
-                             'newsticker-previous-feed
+                         :enable '(newsticker-previous-feed-available-p))
-                             :help "Go to previous feed"
+      (tool-bar-add-item "newsticker/prev-item"
-                             :enable '(newsticker-previous-feed-available-p))
+                         'newsticker-previous-item
-          (tool-bar-add-item "newsticker/prev-item"
+                         'newsticker-previous-item
-                             'newsticker-previous-item
+                         :help "Go to previous item"
-                             'newsticker-previous-item
+                         :enable '(newsticker-previous-item-available-p))
-                             :help "Go to previous item"
+      (tool-bar-add-item "newsticker/next-item"
-                             :enable '(newsticker-previous-item-available-p))
+                         'newsticker-next-item
-          (tool-bar-add-item "newsticker/next-item"
+                         'newsticker-next-item
-                             'newsticker-next-item
+                         :help "Go to next item"
-                             'newsticker-next-item
+                         :enable '(newsticker-next-item-available-p))
-                             :help "Go to next item"
+      (tool-bar-add-item "newsticker/next-feed"
-                             :enable '(newsticker-next-item-available-p))
+                         'newsticker-next-feed
-          (tool-bar-add-item "newsticker/next-feed"
+                         'newsticker-next-feed
-                             'newsticker-next-feed
+                         :help "Go to next feed"
-                             'newsticker-next-feed
+                         :enable '(newsticker-next-feed-available-p))
-                             :help "Go to next feed"
+      (tool-bar-add-item "newsticker/narrow"
-                             :enable '(newsticker-next-feed-available-p))
+                         'newsticker-toggle-auto-narrow-to-feed
-          (tool-bar-add-item "newsticker/narrow"
+                         'newsticker-toggle-auto-narrow-to-feed
-                             'newsticker-toggle-auto-narrow-to-feed
+                         :help "Toggle visibility of other feeds")
-                             'newsticker-toggle-auto-narrow-to-feed
+      (tool-bar-add-item "newsticker/mark-immortal"
-                             :help "Toggle visibility of other feeds")
+                         'newsticker-mark-item-at-point-as-immortal
-          (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"
-                             'newsticker-mark-item-at-point-as-immortal
+                         :enable '(newsticker-item-not-immortal-p))
-                             :help "Mark current item as immortal"
+      (tool-bar-add-item "newsticker/mark-read"
-                             :enable '(newsticker-item-not-immortal-p))
+                         'newsticker-mark-item-at-point-as-read
-          (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"
-                             'newsticker-mark-item-at-point-as-read
+                         :enable '(newsticker-item-not-old-p))
-                             :help "Mark current item as read"
+      (tool-bar-add-item "newsticker/get-all-news"
-                             :enable '(newsticker-item-not-old-p))
+                         'newsticker-get-all-news
-          (tool-bar-add-item "newsticker/get-all-news"
+                         'newsticker-get-all-news
-                             'newsticker-get-all-news
+                         :help "Get news for all feeds")
-                             'newsticker-get-all-news
+      (tool-bar-add-item "newsticker/update"
-                             :help "Get news for all feeds")
+                         'newsticker-buffer-force-update
-          (tool-bar-add-item "newsticker/update"
+                         'newsticker-buffer-force-update
-                             'newsticker-buffer-force-update
+                         :help "Update newsticker buffer"
-                             'newsticker-buffer-force-update
+                         :enable '(not newsticker--buffer-uptodate-p))
-                             :help "Update newsticker buffer"
+      (tool-bar-add-item "newsticker/browse-url"
-                             :enable '(not newsticker--buffer-uptodate-p))
+                         'newsticker-browse-url
-          (tool-bar-add-item "newsticker/browse-url"
+                         'newsticker-browse-url
-                             'newsticker-browse-url
+                         :help "Browse URL for item at point")
-                             'newsticker-browse-url
+      ;; standard icons / actions
-                             :help "Browse URL for item at point")
+      (define-key tool-bar-map [newsticker-sep-1]
-          ;; standard icons / actions
+        (list 'menu-item "--double-line"))
-          (define-key tool-bar-map [newsticker-sep-1]
+      (tool-bar-add-item "close"
-            (list 'menu-item "--double-line"))
+                         'newsticker-close-buffer
-          (tool-bar-add-item "close"
+                         'newsticker-close-buffer
-                             'newsticker-close-buffer
+                         :help "Close newsticker buffer")
-                             'newsticker-close-buffer
+      (tool-bar-add-item "preferences"
-                             :help "Close newsticker buffer")
+                         '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))))
 ;; ======================================================================
 ;;; Newsticker mode
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)
+  (when (boundp 'tool-bar-map)
-      nil
+    (let ((tool-bar-map (make-sparse-keymap)))
-    (if (boundp 'tool-bar-map)
+      (tool-bar-add-item "newsticker/prev-feed"
-        (let ((tool-bar-map (make-sparse-keymap)))
+                         'newsticker-treeview-prev-feed
-          (tool-bar-add-item "newsticker/prev-feed"
+                         'newsticker-treeview-prev-feed
-                             'newsticker-treeview-prev-feed
+                         :help "Go to previous feed"
-                             'newsticker-treeview-prev-feed
+                         ;;:enable '(newsticker-previous-feed-available-p) FIXME
-                             :help "Go to previous feed"
+                         )
-                             ;;:enable '(newsticker-previous-feed-available-p) FIXME
+      (tool-bar-add-item "newsticker/prev-item"
-                             )
+                         'newsticker-treeview-prev-item
-          (tool-bar-add-item "newsticker/prev-item"
+                         'newsticker-treeview-prev-item
-                             'newsticker-treeview-prev-item
+                         :help "Go to previous item"
-                             'newsticker-treeview-prev-item
+                         ;;:enable '(newsticker-previous-item-available-p) FIXME
-                             :help "Go to previous item"
+                         )
-                             ;;:enable '(newsticker-previous-item-available-p) FIXME
+      (tool-bar-add-item "newsticker/next-item"
-                             )
+                         'newsticker-treeview-next-item
-          (tool-bar-add-item "newsticker/next-item"
+                         'newsticker-treeview-next-item
-                             'newsticker-treeview-next-item
+                         :visible t
-                             'newsticker-treeview-next-item
+                         :help "Go to next item"
-                             :visible t
+                         ;;:enable '(newsticker-next-item-available-p) FIXME
-                             :help "Go to next item"
+                         )
-                             ;;:enable '(newsticker-next-item-available-p) FIXME
+      (tool-bar-add-item "newsticker/next-feed"
-                             )
+                         'newsticker-treeview-next-feed
-          (tool-bar-add-item "newsticker/next-feed"
+                         'newsticker-treeview-next-feed
-                             'newsticker-treeview-next-feed
+                         :help "Go to next feed"
-                             'newsticker-treeview-next-feed
+                         ;;:enable '(newsticker-next-feed-available-p) FIXME
-                             :help "Go to next feed"
+                         )
-                             ;;:enable '(newsticker-next-feed-available-p) FIXME
+      (tool-bar-add-item "newsticker/mark-immortal"
-                             )
+                         'newsticker-treeview-toggle-item-immortal
-          (tool-bar-add-item "newsticker/mark-immortal"
+                         'newsticker-treeview-toggle-item-immortal
-                             'newsticker-treeview-toggle-item-immortal
+                         :help "Toggle current item as immortal"
-                             'newsticker-treeview-toggle-item-immortal
+                         ;;:enable '(newsticker-item-not-immortal-p) FIXME
-                             :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
-          (tool-bar-add-item "newsticker/mark-read"
+                         'newsticker-treeview-mark-item-old
-                             'newsticker-treeview-mark-item-old
+                         :help "Mark current item as read"
-                             'newsticker-treeview-mark-item-old
+                         ;;:enable '(newsticker-item-not-old-p) FIXME
-                             :help "Mark current item as read"
+                         )
-                             ;;:enable '(newsticker-item-not-old-p) FIXME
+      (tool-bar-add-item "newsticker/get-all"
-                             )
+                         'newsticker-get-all-news
-          (tool-bar-add-item "newsticker/get-all"
+                         'newsticker-get-all-news
-                             'newsticker-get-all-news
+                         :help "Get news for all feeds")
-                             'newsticker-get-all-news
+      (tool-bar-add-item "newsticker/update"
-                             :help "Get news for all feeds")
+                         'newsticker-treeview-update
-          (tool-bar-add-item "newsticker/update"
+                         'newsticker-treeview-update
-                             'newsticker-treeview-update
+                         :help "Update newsticker buffer")
-                             'newsticker-treeview-update
+      (tool-bar-add-item "newsticker/browse-url"
-                             :help "Update newsticker buffer")
+                         'newsticker-browse-url
-          (tool-bar-add-item "newsticker/browse-url"
+                         'newsticker-browse-url
-                             'newsticker-browse-url
+                         :help "Browse URL for item at point")
-                             'newsticker-browse-url
+      ;; standard icons / actions
-                             :help "Browse URL for item at point")
+      (define-key tool-bar-map [newsticker-sep-1]
-          ;; standard icons / actions
+        (list 'menu-item "--double-line"))
-          (define-key tool-bar-map [newsticker-sep-1]
+      (tool-bar-add-item "close"
-            (list 'menu-item "--double-line"))
+                         '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
author	Lars Ingebrigtsen	2019-10-09 02:46:17 +0200
committer	Lars Ingebrigtsen	2019-10-09 02:46:17 +0200
commit	97702f5292307c71c9c124604bf85b6c629f3bb6 (patch)
tree	20f6d1b707c4eaf6e27c554ea07bf0d453397208
parent	f96b8fd27c382a941c52c2938544b9b0e3a2fb0e (diff)
download	emacs-97702f5292307c71c9c124604bf85b6c629f3bb6.tar.gz emacs-97702f5292307c71c9c124604bf85b6c629f3bb6.zip

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."
273	;; ======================================================================	273	;; ======================================================================
274		274
275	(defvar newsticker--plainview-tool-bar-map	275	(defvar newsticker--plainview-tool-bar-map
276	(if (featurep 'xemacs)	276	(when (boundp 'tool-bar-map)
277	nil	277	(let ((tool-bar-map (make-sparse-keymap)))
278	(if (boundp 'tool-bar-map)	278	(tool-bar-add-item "newsticker/prev-feed"
279	(let ((tool-bar-map (make-sparse-keymap)))	279	'newsticker-previous-feed
280	(tool-bar-add-item "newsticker/prev-feed"	280	'newsticker-previous-feed
281	'newsticker-previous-feed	281	:help "Go to previous feed"
282	'newsticker-previous-feed	282	:enable '(newsticker-previous-feed-available-p))
283	:help "Go to previous feed"	283	(tool-bar-add-item "newsticker/prev-item"
284	:enable '(newsticker-previous-feed-available-p))	284	'newsticker-previous-item
285	(tool-bar-add-item "newsticker/prev-item"	285	'newsticker-previous-item
286	'newsticker-previous-item	286	:help "Go to previous item"
287	'newsticker-previous-item	287	:enable '(newsticker-previous-item-available-p))
288	:help "Go to previous item"	288	(tool-bar-add-item "newsticker/next-item"
289	:enable '(newsticker-previous-item-available-p))	289	'newsticker-next-item
290	(tool-bar-add-item "newsticker/next-item"	290	'newsticker-next-item
291	'newsticker-next-item	291	:help "Go to next item"
292	'newsticker-next-item	292	:enable '(newsticker-next-item-available-p))
293	:help "Go to next item"	293	(tool-bar-add-item "newsticker/next-feed"
294	:enable '(newsticker-next-item-available-p))	294	'newsticker-next-feed
295	(tool-bar-add-item "newsticker/next-feed"	295	'newsticker-next-feed
296	'newsticker-next-feed	296	:help "Go to next feed"
297	'newsticker-next-feed	297	:enable '(newsticker-next-feed-available-p))
298	:help "Go to next feed"	298	(tool-bar-add-item "newsticker/narrow"
299	:enable '(newsticker-next-feed-available-p))	299	'newsticker-toggle-auto-narrow-to-feed
300	(tool-bar-add-item "newsticker/narrow"	300	'newsticker-toggle-auto-narrow-to-feed
301	'newsticker-toggle-auto-narrow-to-feed	301	:help "Toggle visibility of other feeds")
302	'newsticker-toggle-auto-narrow-to-feed	302	(tool-bar-add-item "newsticker/mark-immortal"
303	:help "Toggle visibility of other feeds")	303	'newsticker-mark-item-at-point-as-immortal
304	(tool-bar-add-item "newsticker/mark-immortal"	304	'newsticker-mark-item-at-point-as-immortal
305	'newsticker-mark-item-at-point-as-immortal	305	:help "Mark current item as immortal"
306	'newsticker-mark-item-at-point-as-immortal	306	:enable '(newsticker-item-not-immortal-p))
307	:help "Mark current item as immortal"	307	(tool-bar-add-item "newsticker/mark-read"
308	:enable '(newsticker-item-not-immortal-p))	308	'newsticker-mark-item-at-point-as-read
309	(tool-bar-add-item "newsticker/mark-read"	309	'newsticker-mark-item-at-point-as-read
310	'newsticker-mark-item-at-point-as-read	310	:help "Mark current item as read"
311	'newsticker-mark-item-at-point-as-read	311	:enable '(newsticker-item-not-old-p))
312	:help "Mark current item as read"	312	(tool-bar-add-item "newsticker/get-all-news"
313	:enable '(newsticker-item-not-old-p))	313	'newsticker-get-all-news
314	(tool-bar-add-item "newsticker/get-all-news"	314	'newsticker-get-all-news
315	'newsticker-get-all-news	315	:help "Get news for all feeds")
316	'newsticker-get-all-news	316	(tool-bar-add-item "newsticker/update"
317	:help "Get news for all feeds")	317	'newsticker-buffer-force-update
318	(tool-bar-add-item "newsticker/update"	318	'newsticker-buffer-force-update
319	'newsticker-buffer-force-update	319	:help "Update newsticker buffer"
320	'newsticker-buffer-force-update	320	:enable '(not newsticker--buffer-uptodate-p))
321	:help "Update newsticker buffer"	321	(tool-bar-add-item "newsticker/browse-url"
322	:enable '(not newsticker--buffer-uptodate-p))	322	'newsticker-browse-url
323	(tool-bar-add-item "newsticker/browse-url"	323	'newsticker-browse-url
324	'newsticker-browse-url	324	:help "Browse URL for item at point")
325	'newsticker-browse-url	325	;; standard icons / actions
326	:help "Browse URL for item at point")	326	(define-key tool-bar-map [newsticker-sep-1]
327	;; standard icons / actions	327	(list 'menu-item "--double-line"))
328	(define-key tool-bar-map [newsticker-sep-1]	328	(tool-bar-add-item "close"
329	(list 'menu-item "--double-line"))	329	'newsticker-close-buffer
330	(tool-bar-add-item "close"	330	'newsticker-close-buffer
331	'newsticker-close-buffer	331	:help "Close newsticker buffer")
332	'newsticker-close-buffer	332	(tool-bar-add-item "preferences"
333	:help "Close newsticker buffer")	333	'newsticker-customize
334	(tool-bar-add-item "preferences"	334	'newsticker-customize
335	'newsticker-customize	335	:help "Customize newsticker")
336	'newsticker-customize	336	tool-bar-map)))
337	:help "Customize newsticker")
338	tool-bar-map))))
339		337
340	;; ======================================================================	338	;; ======================================================================
341	;;; Newsticker mode	339	;;; Newsticker mode


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."
1093	;;; Toolbar	1093	;;; Toolbar
1094	;; ======================================================================	1094	;; ======================================================================
1095	(defvar newsticker-treeview-tool-bar-map	1095	(defvar newsticker-treeview-tool-bar-map
1096	(if (featurep 'xemacs)	1096	(when (boundp 'tool-bar-map)
1097	nil	1097	(let ((tool-bar-map (make-sparse-keymap)))
1098	(if (boundp 'tool-bar-map)	1098	(tool-bar-add-item "newsticker/prev-feed"
1099	(let ((tool-bar-map (make-sparse-keymap)))	1099	'newsticker-treeview-prev-feed
1100	(tool-bar-add-item "newsticker/prev-feed"	1100	'newsticker-treeview-prev-feed
1101	'newsticker-treeview-prev-feed	1101	:help "Go to previous feed"
1102	'newsticker-treeview-prev-feed	1102	;;:enable '(newsticker-previous-feed-available-p) FIXME
1103	:help "Go to previous feed"	1103	)
1104	;;:enable '(newsticker-previous-feed-available-p) FIXME	1104	(tool-bar-add-item "newsticker/prev-item"
1105	)	1105	'newsticker-treeview-prev-item
1106	(tool-bar-add-item "newsticker/prev-item"	1106	'newsticker-treeview-prev-item
1107	'newsticker-treeview-prev-item	1107	:help "Go to previous item"
1108	'newsticker-treeview-prev-item	1108	;;:enable '(newsticker-previous-item-available-p) FIXME
1109	:help "Go to previous item"	1109	)
1110	;;:enable '(newsticker-previous-item-available-p) FIXME	1110	(tool-bar-add-item "newsticker/next-item"
1111	)	1111	'newsticker-treeview-next-item
1112	(tool-bar-add-item "newsticker/next-item"	1112	'newsticker-treeview-next-item
1113	'newsticker-treeview-next-item	1113	:visible t
1114	'newsticker-treeview-next-item	1114	:help "Go to next item"
1115	:visible t	1115	;;:enable '(newsticker-next-item-available-p) FIXME
1116	:help "Go to next item"	1116	)
1117	;;:enable '(newsticker-next-item-available-p) FIXME	1117	(tool-bar-add-item "newsticker/next-feed"
1118	)	1118	'newsticker-treeview-next-feed
1119	(tool-bar-add-item "newsticker/next-feed"	1119	'newsticker-treeview-next-feed
1120	'newsticker-treeview-next-feed	1120	:help "Go to next feed"
1121	'newsticker-treeview-next-feed	1121	;;:enable '(newsticker-next-feed-available-p) FIXME
1122	:help "Go to next feed"	1122	)
1123	;;:enable '(newsticker-next-feed-available-p) FIXME	1123	(tool-bar-add-item "newsticker/mark-immortal"
1124	)	1124	'newsticker-treeview-toggle-item-immortal
1125	(tool-bar-add-item "newsticker/mark-immortal"	1125	'newsticker-treeview-toggle-item-immortal
1126	'newsticker-treeview-toggle-item-immortal	1126	:help "Toggle current item as immortal"
1127	'newsticker-treeview-toggle-item-immortal	1127	;;:enable '(newsticker-item-not-immortal-p) FIXME
1128	:help "Toggle current item as immortal"	1128	)
1129	;;:enable '(newsticker-item-not-immortal-p) FIXME	1129	(tool-bar-add-item "newsticker/mark-read"
1130	)	1130	'newsticker-treeview-mark-item-old
1131	(tool-bar-add-item "newsticker/mark-read"	1131	'newsticker-treeview-mark-item-old
1132	'newsticker-treeview-mark-item-old	1132	:help "Mark current item as read"
1133	'newsticker-treeview-mark-item-old	1133	;;:enable '(newsticker-item-not-old-p) FIXME
1134	:help "Mark current item as read"	1134	)
1135	;;:enable '(newsticker-item-not-old-p) FIXME	1135	(tool-bar-add-item "newsticker/get-all"
1136	)	1136	'newsticker-get-all-news
1137	(tool-bar-add-item "newsticker/get-all"	1137	'newsticker-get-all-news
1138	'newsticker-get-all-news	1138	:help "Get news for all feeds")
1139	'newsticker-get-all-news	1139	(tool-bar-add-item "newsticker/update"
1140	:help "Get news for all feeds")	1140	'newsticker-treeview-update
1141	(tool-bar-add-item "newsticker/update"	1141	'newsticker-treeview-update
1142	'newsticker-treeview-update	1142	:help "Update newsticker buffer")
1143	'newsticker-treeview-update	1143	(tool-bar-add-item "newsticker/browse-url"
1144	:help "Update newsticker buffer")	1144	'newsticker-browse-url
1145	(tool-bar-add-item "newsticker/browse-url"	1145	'newsticker-browse-url
1146	'newsticker-browse-url	1146	:help "Browse URL for item at point")
1147	'newsticker-browse-url	1147	;; standard icons / actions
1148	:help "Browse URL for item at point")	1148	(define-key tool-bar-map [newsticker-sep-1]
1149	;; standard icons / actions	1149	(list 'menu-item "--double-line"))
1150	(define-key tool-bar-map [newsticker-sep-1]	1150	(tool-bar-add-item "close"
1151	(list 'menu-item "--double-line"))	1151	'newsticker-treeview-quit
1152	(tool-bar-add-item "close"	1152	'newsticker-treeview-quit
1153	'newsticker-treeview-quit	1153	:help "Close newsticker")
1154	'newsticker-treeview-quit	1154	(tool-bar-add-item "preferences"
1155	:help "Close newsticker")	1155	'newsticker-customize
1156	(tool-bar-add-item "preferences"	1156	'newsticker-customize
1157	'newsticker-customize	1157	:help "Customize newsticker")
1158	'newsticker-customize	1158	tool-bar-map)))
1159	:help "Customize newsticker")
1160	tool-bar-map))))
1161		1159
1162	;; ======================================================================	1160	;; ======================================================================
1163	;;; actions	1161	;;; actions