]> git.eshelyaron.com Git - emacs.git/commitdiff
Remove the "retro" Gnus/Message tool bars
authorLars Ingebrigtsen <larsi@gnus.org>
Sat, 30 Apr 2022 16:17:47 +0000 (18:17 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Sat, 30 Apr 2022 16:18:32 +0000 (18:18 +0200)
* doc/misc/gnus.texi (Gravatars): Remove documentation.
* lisp/gnus/gmm-utils.el (gmm-tool-bar-style): Obsoleted.

* lisp/gnus/gnus-group.el (gnus-group-tool-bar): Use the "Gnome"
definition.
(gnus-group-tool-bar-gnome, gnus-group-tool-bar-retro)
(gnus-group-tool-bar-zap-list): Obsolete.

* lisp/gnus/gnus-sum.el (gnus-summary-tool-bar): Use the "Gnome"
definition.
(gnus-summary-tool-bar-gnome, gnus-summary-tool-bar-retro)
(gnus-summary-tool-bar-zap-list): Obsolete.

* lisp/gnus/message.el (message-tool-bar): Use the "Gnome"
definition.
(message-tool-bar-gnome, message-tool-bar-retro)
(message-tool-bar-zap-list): Obsolete.

50 files changed:
doc/misc/gnus.texi
etc/NEWS
etc/images/gnus/catchup.pbm [deleted file]
etc/images/gnus/catchup.xpm [deleted file]
etc/images/gnus/cu-exit.pbm [deleted file]
etc/images/gnus/cu-exit.xpm [deleted file]
etc/images/gnus/describe-group.pbm [deleted file]
etc/images/gnus/describe-group.xpm [deleted file]
etc/images/gnus/exit-gnus.pbm [deleted file]
etc/images/gnus/exit-gnus.xpm [deleted file]
etc/images/gnus/exit-summ.pbm [deleted file]
etc/images/gnus/exit-summ.xpm [deleted file]
etc/images/gnus/get-news.pbm [deleted file]
etc/images/gnus/get-news.xpm [deleted file]
etc/images/gnus/gnntg.pbm [deleted file]
etc/images/gnus/gnntg.xpm [deleted file]
etc/images/gnus/important.pbm [deleted file]
etc/images/gnus/important.xpm [deleted file]
etc/images/gnus/next-ur.pbm [deleted file]
etc/images/gnus/next-ur.xpm [deleted file]
etc/images/gnus/post.pbm [deleted file]
etc/images/gnus/post.xpm [deleted file]
etc/images/gnus/prev-ur.pbm [deleted file]
etc/images/gnus/prev-ur.xpm [deleted file]
etc/images/gnus/receipt.pbm [deleted file]
etc/images/gnus/receipt.xpm [deleted file]
etc/images/gnus/reply-wo.pbm [deleted file]
etc/images/gnus/reply-wo.xpm [deleted file]
etc/images/gnus/reply.pbm [deleted file]
etc/images/gnus/reply.xpm [deleted file]
etc/images/gnus/rot13.pbm [deleted file]
etc/images/gnus/rot13.xpm [deleted file]
etc/images/gnus/save-aif.pbm [deleted file]
etc/images/gnus/save-aif.xpm [deleted file]
etc/images/gnus/save-art.pbm [deleted file]
etc/images/gnus/save-art.xpm [deleted file]
etc/images/gnus/subscribe.pbm [deleted file]
etc/images/gnus/subscribe.xpm [deleted file]
etc/images/gnus/unimportant.pbm [deleted file]
etc/images/gnus/unimportant.xpm [deleted file]
etc/images/gnus/unsubscribe.pbm [deleted file]
etc/images/gnus/unsubscribe.xpm [deleted file]
etc/images/gnus/uu-decode.pbm [deleted file]
etc/images/gnus/uu-decode.xpm [deleted file]
etc/images/gnus/uu-post.pbm [deleted file]
etc/images/gnus/uu-post.xpm [deleted file]
lisp/gnus/gmm-utils.el
lisp/gnus/gnus-group.el
lisp/gnus/gnus-sum.el
lisp/gnus/message.el

index 9faace1a75e18c86f2b67fbdacf3cc682f6d94f3..e51ae7d424d794e347bcedd68f92fae0e8211ff6 100644 (file)
@@ -24168,15 +24168,12 @@ If you want to see them in the Cc and To fields, set:
 @item gnus-group-tool-bar
 @vindex gnus-group-tool-bar
 Specifies the tool bar in the group buffer.  It can be either a list
-or a symbol referring to a list.  Pre-defined symbols include
-@code{gnus-group-tool-bar-gnome} and @code{gnus-group-tool-bar-retro}.
+or a symbol referring to a list.
 
 @item gnus-summary-tool-bar
 @vindex gnus-summary-tool-bar
 Specifies the tool bar in the summary buffer.  It can be either a list
-or a symbol referring to a list.  Pre-defined symbols include
-@code{gnus-summary-tool-bar-gnome} and
-@code{gnus-summary-tool-bar-retro}.
+or a symbol referring to a list.
 
 @end table
 
index eebde1b4d0151196c39361262b7bb9043d7b6d8c..47e04cfcbe965863a182b45b13843e1fc2335780 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -929,6 +929,16 @@ the common "utm_" trackers from URLs.
 
 ** Gnus
 
++++
+*** Tool bar changes in Gnus/Message.
+There were previously two styles of tool bars available in Gnus and
+Message, referred to as 'gnus-summary-tool-bar-retro',
+'gnus-group-tool-bar-retro' and 'message-tool-bar-retro', and
+'gnus-summary-tool-bar-gnome', 'gnus-group-tool-bar-gnome' and
+'message-tool-bar-gnome'.  The "retro" tool bars have been removed (as
+well as the icons used), and the "Gnome" tool bars are now the only
+pre-defined toolbars.
+
 ---
 *** Gnus now uses a variable-pitch font in the headers by default.
 To get the monospace font back, you can put something like the
diff --git a/etc/images/gnus/catchup.pbm b/etc/images/gnus/catchup.pbm
deleted file mode 100644 (file)
index 3fc571b..0000000
Binary files a/etc/images/gnus/catchup.pbm and /dev/null differ
diff --git a/etc/images/gnus/catchup.xpm b/etc/images/gnus/catchup.xpm
deleted file mode 100644 (file)
index cba8497..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * catchup_xpm[] = {
-"24 24 6 1",
-"      c None",
-".     c #FFFFFFFFFFFF",
-"X     c #E1E1E0E0E0E0",
-"o     c #A5A5A5A59595",
-"O     c #999999999999",
-"+     c #000000000000",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"            .           ",
-"         .  .X          ",
-"       ...  .oX  .      ",
-"     ..oooX.oXo  .X     ",
-"    .oooXXXX..oXXoXX    ",
-"    .oXXXX.XoX.oXooX    ",
-"     X...X.X.XX.XoXX    ",
-"     Xo..X.XXX.XXXX     ",
-"   . Xo.oXX..XXXXXX     ",
-"OOOOXoXXXXXo.XXXXX++OOOO",
-"OOOOOX..X.XXXXXXXX++OOOO",
-"OOOOOX..XXXXXXXXX++OOOOO",
-"OOOOOOXXXXXXXXX+++OOOOOO",
-"OOOOOOOOOXXXX++++OOOOOOO",
-"OOOOOOOOO+++++OOOOOOOOOO",
-"OOOOOOOOOO+OOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO"};
diff --git a/etc/images/gnus/cu-exit.pbm b/etc/images/gnus/cu-exit.pbm
deleted file mode 100644 (file)
index 210869c..0000000
Binary files a/etc/images/gnus/cu-exit.pbm and /dev/null differ
diff --git a/etc/images/gnus/cu-exit.xpm b/etc/images/gnus/cu-exit.xpm
deleted file mode 100644 (file)
index 1723622..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * cu_exit_xpm[] = {
-"24 24 4 1",
-"      c None",
-".     c #000000000000",
-"X     c #FFFFFFFFFFFF",
-"o     c #999999999999",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"           .....        ",
-"        .. .XXX.        ",
-"      ..X..XXXX...      ",
-"     .XXXX.XXXX.X...    ",
-"    ..XXXX.XXX.XXX..    ",
-"     .XXX..........     ",
-"     .XXX.XXX.XXX..     ",
-"      .XX.XXX.XXX.      ",
-"      .XX.XXX.XX..      ",
-"      ............      ",
-"       .X.X.X.X..       ",
-"ooooooo..........ooooooo",
-"ooooooo.X.X.X.X.oooooooo",
-"ooooooo.........oooooooo",
-"ooooooo..X...X..oooooooo",
-"ooooooo...X.X...oooooooo",
-"ooooooo........ooooooooo",
-"ooooooooo.....oooooooooo",
-"oooooooooooooooooooooooo"};
diff --git a/etc/images/gnus/describe-group.pbm b/etc/images/gnus/describe-group.pbm
deleted file mode 100644 (file)
index de7bf11..0000000
Binary files a/etc/images/gnus/describe-group.pbm and /dev/null differ
diff --git a/etc/images/gnus/describe-group.xpm b/etc/images/gnus/describe-group.xpm
deleted file mode 100644 (file)
index b4a6f42..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * describe_group_xpm[] = {
-"24 24 5 1",
-".     c None",
-"      c #000000000000",
-"o     c #FFFFF5F5ACAC",
-"+     c #E1E1E0E0E0E0",
-"@     c #C7C7C6C6C6C6",
-"........................",
-"........................",
-".................oooo...",
-" .. .. .. .. .. oo oo o.",
-"..............oooooooooo",
-".............ooooooooooo",
-" .. .. .. .. oo oo oo oo",
-"............oooooooooooo",
-"............oooooooooooo",
-" .. .. .. .. oo oo oo oo",
-"............oooooooooooo",
-"............oooooooooooo",
-" .. .. .. .. oo oo oo oo",
-"............oooooooooooo",
-".....    ...oooooooooooo",
-" ..   ++  .. .o oo oo oo",
-"...  @@@+  ....ooooooooo",
-"...     @  ....oooooooo.",
-" .         . .. .. .. ..",
-".         ..............",
-"        ................",
-"       .. .. .. .. .. ..",
-"      ..................",
-"    ...................."};
diff --git a/etc/images/gnus/exit-gnus.pbm b/etc/images/gnus/exit-gnus.pbm
deleted file mode 100644 (file)
index 32ad0e0..0000000
Binary files a/etc/images/gnus/exit-gnus.pbm and /dev/null differ
diff --git a/etc/images/gnus/exit-gnus.xpm b/etc/images/gnus/exit-gnus.xpm
deleted file mode 100644 (file)
index 534f3c2..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * exit_gnus_xpm[] = {
-"24 24 6 1",
-"      c None",
-".     c #8686ADAD7D7D",
-"X     c #919187876969",
-"o     c #C2C2B9B99C9C",
-"O     c #A8A8F0F0ECEC",
-"+     c #EFEFEFEFEFEF",
-"                        ",
-"     ....  .            ",
-"        .. .. .         ",
-"  .............         ",
-"   . . . ....           ",
-"     .............      ",
-"  .............. ..     ",
-"  . . ..........  .     ",
-"      .XXXX... ..       ",
-"       o.XXX. . ..      ",
-"      oo.X. ..  ...     ",
-"     ooX. . ...         ",
-"     oXo.     ..        ",
-"    ooX      . .        ",
-"    ooX                 ",
-"OOOOoXXOOOOOOOOOOOOOOOOO",
-"OOOoXoXOOOOOOOOOOOOOOOOO",
-"OOOooXXOOOO+OOOOOOOOOOOO",
-"O+OoooXOO+OOO+OO+OOO+OOO",
-"OXXoXoXoXOO++O++OO++OO+O",
-"XXXXXXXXXXXX+OOOOOOOOOOO",
-"XXXXXXXXXXXXXX+O++OO++OO",
-"XXXXXXXXXXXXXXXXOOOOOOOO",
-"O++O++++O+OO++OOOO++OOO+"};
diff --git a/etc/images/gnus/exit-summ.pbm b/etc/images/gnus/exit-summ.pbm
deleted file mode 100644 (file)
index d019231..0000000
Binary files a/etc/images/gnus/exit-summ.pbm and /dev/null differ
diff --git a/etc/images/gnus/exit-summ.xpm b/etc/images/gnus/exit-summ.xpm
deleted file mode 100644 (file)
index 5234ccb..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * exit_summ_xpm[] = {
-"24 24 3 1",
-".     c None",
-"      c #000000000000",
-"X     c #E1E1E0E0E0E0",
-" .. .. .. .. .. .. .. ..",
-"........................",
-"........................",
-" .. ..             .. ..",
-"......  XXXX       .....",
-"......  XXXXXXX    .....",
-" .. .. XX XX XX    .. ..",
-"...... XXXXXXXX    .....",
-"......  XXXXXXX    .....",
-" .. ..  X XX       .. ..",
-"......  XXXX       .....",
-"......  XXXX       .....",
-" .. ..  X XXXXX    .. ..",
-"......  XXXXXXX    .....",
-"...... XXXXX XX    .....",
-" .. ..  X XXXXX    .. ..",
-"......  XXXXX      .....",
-"......  X          .....",
-" .. . .            .. ..",
-"........................",
-"........................",
-" .. .. .. .. .. .. .. ..",
-"........................",
-"........................"};
diff --git a/etc/images/gnus/get-news.pbm b/etc/images/gnus/get-news.pbm
deleted file mode 100644 (file)
index c008071..0000000
Binary files a/etc/images/gnus/get-news.pbm and /dev/null differ
diff --git a/etc/images/gnus/get-news.xpm b/etc/images/gnus/get-news.xpm
deleted file mode 100644 (file)
index d7e7b4a..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * get_news_xpm[] = {
-"24 24 4 1",
-".     c None",
-"X     c #A5A5A5A59595",
-"o     c #E1E1E0E0E0E0",
-"O     c #C7C7C6C6C6C6",
-"........................",
-"........................",
-"........................",
-".....XXX................",
-"...XXoooXXXXX...........",
-"XXXoooooXXoooX.XXX......",
-"XoXooXXXooooXXXoooX.....",
-"XooXoXoXooXXXoooooX.....",
-"XooXXXooXoXoXooooooX....",
-"XooXOXooXXXooXooooooX...",
-"XoXOOXooXOXooXXooooooX..",
-"OXOOOXoXOOXooXoooooooX..",
-"OXOooOXOOOXoXOooooooooX.",
-".OXooOXOooOXOOooooooooX.",
-".OXoooOXooOXOooooooooooX",
-"..OXooOXoooOXooooooooooX",
-"..OXooOOXooOXooooooooooX",
-"...OXooOXoooOXoooooooXXX",
-"...OXooXOXooOXooooooXOO.",
-"....OXXOOXooXOXoooXXO...",
-".....OO..OXXOOXooXOO....",
-"..........OO..OXXO......",
-"...............OO.......",
-"........................"};
diff --git a/etc/images/gnus/gnntg.pbm b/etc/images/gnus/gnntg.pbm
deleted file mode 100644 (file)
index 2f5e526..0000000
Binary files a/etc/images/gnus/gnntg.pbm and /dev/null differ
diff --git a/etc/images/gnus/gnntg.xpm b/etc/images/gnus/gnntg.xpm
deleted file mode 100644 (file)
index 21bc5f1..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * gnntg_xpm[] = {
-"24 24 4 1",
-"      c None",
-".     c #000000000000",
-"X     c #FFFFFFFFFFFF",
-"o     c #C7C7C6C6C6C6",
-"                        ",
-" .......                ",
-" .XXXXX.                ",
-" .XXXXX.       ...      ",
-" .XXXXX...    .ooo.     ",
-" .XXXXX....  ..ooo..    ",
-" .XXXXX..o.. ..ooo..    ",
-" .XXXXX...o.. ..o..     ",
-" .XXXXX. ..o........    ",
-" .XXXXX.  ..oooooooo.   ",
-" .......   .oooooooo..  ",
-"            .ooooo..o.  ",
-"             .oooo..o.  ",
-"             .oooo..o.  ",
-"             .oooo..o.  ",
-"             .oooo..o.  ",
-"             .........  ",
-"            ......oo.   ",
-"            .ooooo...   ",
-"            .oo..o...   ",
-"            .oo..o..    ",
-"            ........    ",
-"            .... ...    ",
-"            ...  ...    "};
diff --git a/etc/images/gnus/important.pbm b/etc/images/gnus/important.pbm
deleted file mode 100644 (file)
index 7139ff2..0000000
Binary files a/etc/images/gnus/important.pbm and /dev/null differ
diff --git a/etc/images/gnus/important.xpm b/etc/images/gnus/important.xpm
deleted file mode 100644 (file)
index e972fac..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char *magick[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 2  1",
-"! c red",
-"w c Gray75",
-/* pixels */
-"wwwwwwwwwwwwwwwwwwwwwwww",
-"wwwwwwwwwwwwwwwwwwwwwwww",
-"wwwwwwwww!!!wwwwwwwwwwww",
-"wwwwwwwww!!!wwwwwwwwwwww",
-"wwwwwwww!!!!!wwwwwwwwwww",
-"wwwwwwww!!!!!wwwwwwwwwww",
-"wwwwwww!!!!!!!wwwwwwwwww",
-"wwwwwww!!!!!!!wwwwwwwwww",
-"wwwwwww!!!!!!!wwwwwwwwww",
-"wwwwwww!!!!!!!wwwwwwwwww",
-"wwwwwww!!!!!!!wwwwwwwwww",
-"wwwwwww!!!!!!!wwwwwwwwww",
-"wwwwwww!!!!!!!wwwwwwwwww",
-"wwwwwwww!!!!!wwwwwwwwwww",
-"wwwwwwww!!!!!wwwwwwwwwww",
-"wwwwwwww!!!!!wwwwwwwwwww",
-"wwwwwwwww!!!wwwwwwwwwwww",
-"wwwwwwwwwwwwwwwwwwwwwwww",
-"wwwwwwwww!!!wwwwwwwwwwww",
-"wwwwwwww!!!!!wwwwwwwwwww",
-"wwwwwwww!!!!!wwwwwwwwwww",
-"wwwwwwwww!!!wwwwwwwwwwww",
-"wwwwwwwwwwwwwwwwwwwwwwww",
-"wwwwwwwwwwwwwwwwwwwwwwww"
-};
diff --git a/etc/images/gnus/next-ur.pbm b/etc/images/gnus/next-ur.pbm
deleted file mode 100644 (file)
index 678bbb0..0000000
Binary files a/etc/images/gnus/next-ur.pbm and /dev/null differ
diff --git a/etc/images/gnus/next-ur.xpm b/etc/images/gnus/next-ur.xpm
deleted file mode 100644 (file)
index bea1328..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * next_ur_xpm[] = {
-"24 24 8 1",
-".     c None",
-"      c #000000000000",
-"X     c #A5A5A5A59595",
-"o     c #C7C7C6C6C6C6",
-"O     c #FFFF00000000",
-"+     c #9A9A6C6C4E4E",
-"@     c #E1E1E0E0E0E0",
-"#     c #FFFFFFFFFFFF",
-" .. .. .. .. .. .. .. ..",
-"........................",
-"............X...........",
-" .. .. .. .XXX. .. .. ..",
-".........XXooOX.........",
-".......XXooo+O@X........",
-" .. XXXoooo++@@@X. .. ..",
-"....X@Xoooooo@@@X.......",
-"....X@@Xooo@@@@@@X......",
-" .. X@@XXoo@@@@@@@X.. ..",
-"....X@@Xoo@@@@@@@@@X....",
-"....X@Xo@@@XX@@@@@@oX...",
-" .. oXoo@XXooO@@@@@@X ..",
-"....oXoXXooo+OX@@@@Xo...",
-"....XXXoooo++@@X@@Xo....",
-" .. X@Xoooooo@@@XX .. ..",
-"....X@@Xooo@@@@@@X......",
-"....X@@XXoo@@@@@@@X.....",
-" .. X@@Xoo@@@@@@@@@X. ..",
-"....X@Xo@  @@@@@@@  X...",
-"... oXoo ## @@ @@ ## ...",
-" .. oXo ####  @  #### ..",
-".....oX #### @@@ #### ..",
-".....oX@ ## @@@@X ## ..."};
diff --git a/etc/images/gnus/post.pbm b/etc/images/gnus/post.pbm
deleted file mode 100644 (file)
index 577d623..0000000
Binary files a/etc/images/gnus/post.pbm and /dev/null differ
diff --git a/etc/images/gnus/post.xpm b/etc/images/gnus/post.xpm
deleted file mode 100644 (file)
index 7a3eaa5..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * post_xpm[] = {
-"24 24 8 1",
-".     c None",
-"      c #434343434343",
-"X     c #A5A5A5A59595",
-"O     c #000000000000",
-"+     c #C7C7C6C6C6C6",
-"@     c #FFFF00000000",
-"#     c #9A9A6C6C4E4E",
-"$     c #E1E1E0E0E0E0",
-"O..O..O..O..O..O..O..O..",
-"........................",
-"............X...........",
-"O..O..O..O.XXX.O..O..O..",
-".........XX++@X.........",
-".......XX+++#@$X........",
-"O..OXXX++++##$$$X.O..O..",
-"....X$X++++++$$$X.......",
-"....X$$X+++$$$$$$X......",
-"O..OX$$XX++$$$$$$$X..O..",
-"....X$$X++$$$$$$$$$X....",
-"....X$X+$$$$$$$$$$$+X...",
-"O..O+X++$$$$$$$$$$$$XO..",
-"....+X+$$$$$$$$$$$$X+...",
-".....+X$$$$$$$$$$$X+....",
-"O..O.+X$$$$$$$$$XXO..O..",
-"......+X$$$$$$$X++......",
-"......+X$$$$$XX+........",
-"O..O..O+X$$$X++O..O..O..",
-".......+X$$X++..........",
-"........+XX+............",
-"O..O..O..O+.O..O..O..O..",
-"........................",
-"........................"};
diff --git a/etc/images/gnus/prev-ur.pbm b/etc/images/gnus/prev-ur.pbm
deleted file mode 100644 (file)
index 4938919..0000000
Binary files a/etc/images/gnus/prev-ur.pbm and /dev/null differ
diff --git a/etc/images/gnus/prev-ur.xpm b/etc/images/gnus/prev-ur.xpm
deleted file mode 100644 (file)
index 8013133..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * prev_ur_xpm[] = {
-"24 24 8 1",
-".     c None",
-"      c #000000000000",
-"X     c #A5A5A5A59595",
-"o     c #C7C7C6C6C6C6",
-"O     c #FFFF00000000",
-"+     c #9A9A6C6C4E4E",
-"@     c #E1E1E0E0E0E0",
-"#     c #FFFFFFFFFFFF",
-" .. .. .. .. .. .. .. ..",
-"........................",
-"............X...........",
-" .. .. .. .XXX. .. .. ..",
-".........XXooOX.........",
-".......XXooo+O@X........",
-" .. XXXoooo++@@@X. .. ..",
-"....X@Xoooooo@@@X.......",
-"....X@@Xooo@@@@@@X......",
-" .. X@@XXoo@@@@@@@X.. ..",
-"....X@@Xo  @@@@@@  X....",
-"....X@Xo ## X  @ ## X...",
-" .. oXo #XXXoO@ ####  ..",
-"....oXoXXooo+OX #### ...",
-"....XXXoooo++@@X ## ....",
-" .. X@Xoooooo@@@X  .. ..",
-"....X@@Xooo@@@@@@X......",
-"....X@@XXoo@@@@@@@X.....",
-" .. X@@Xoo@@@@@@@@@X. ..",
-"....X@Xo@@@@@@@@@@@@X...",
-"... oXoo@@@@@@@@@@@@X...",
-" .. oXo@@@@@@@@@@@@X....",
-".....oX@@@@@@@@@@@X.....",
-".....oX@@@@@@@@@@X......"};
diff --git a/etc/images/gnus/receipt.pbm b/etc/images/gnus/receipt.pbm
deleted file mode 100644 (file)
index 5595239..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-P4
-24 24
-ÿÿÿÿÿÿÿÿçÿÿ÷ÿÿûÿÿûÿÿçÿÿ\9fÿþ\7fÿÿÇÿÿ¿ÿÿ\7fÿøÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
\ No newline at end of file
diff --git a/etc/images/gnus/receipt.xpm b/etc/images/gnus/receipt.xpm
deleted file mode 100644 (file)
index 18caaf1..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * receipt_xpm[] = {
-"24 24 5 1",
-"      c None",
-".     c #FFFFFFFFFFFF",
-"X     c #676766666363",
-"o     c #FFFF00000000",
-"O     c #AEAE3E3E4848",
-"                        ",
-"                        ",
-"                   ..   ",
-"                    .   ",
-"                     .  ",
-"                     .  ",
-"                   ..   ",
-"           Xooo  ..     ",
-"      Xoooooooo..       ",
-" Xoooooooooooooo  ...   ",
-" oooooooooooOOoo .      ",
-" ooooooooooOOOOo.       ",
-"  oooooooooOO...o       ",
-"  ooooooooooOOooo       ",
-"  ooooooooooooooo       ",
-"   ooooooooooooooo      ",
-"   oooooooooooooo       ",
-"   ooooooooooo          ",
-"    ooooooo             ",
-"    oooo                ",
-"    oo                  ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/etc/images/gnus/reply-wo.pbm b/etc/images/gnus/reply-wo.pbm
deleted file mode 100644 (file)
index def54da..0000000
Binary files a/etc/images/gnus/reply-wo.pbm and /dev/null differ
diff --git a/etc/images/gnus/reply-wo.xpm b/etc/images/gnus/reply-wo.xpm
deleted file mode 100644 (file)
index 370678a..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * reply_wo_xpm[] = {
-"24 24 4 1",
-"      c None",
-".     c #000000000000",
-"X     c #E1E1E0E0E0E0",
-"O     c #FFFFFFFFFFFF",
-"                        ",
-"                        ",
-"                        ",
-"           ....         ",
-"          ..X....       ",
-"         ..XX.XX..      ",
-"       .O.XX.XXXX..     ",
-"     ..O.XXX.XXXX...    ",
-"    .OO.XXXX.X.......   ",
-"   .OO.XXXX...XXX.OO..  ",
-" ..OO.XX....XXXX.OOOO.. ",
-" .......XX.XXXX.OOO.... ",
-" .OOO.XXX.XXXX.OO..OOO. ",
-" .OOOO....XXX....OOOOO. ",
-" .OOOOOOO..XX..OOOOOOO. ",
-" .OOOOOOO......OOOOOOO. ",
-" .OOOOOO.OO..O..OOOOOO. ",
-" .OOOOO.OOOOOOOO.OOOOO. ",
-" .OOOO.OOOOOOOOOO.OOOO. ",
-" .OOO.OOOOOOOOOOOO.OOO. ",
-" .O..OOOOOOOOOOOOOO..O. ",
-" ..OOOOOOOOOOOOOOOOOO.. ",
-" ...................... ",
-"                        "};
diff --git a/etc/images/gnus/reply.pbm b/etc/images/gnus/reply.pbm
deleted file mode 100644 (file)
index ee181e6..0000000
Binary files a/etc/images/gnus/reply.pbm and /dev/null differ
diff --git a/etc/images/gnus/reply.xpm b/etc/images/gnus/reply.xpm
deleted file mode 100644 (file)
index a458848..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * reply_xpm[] = {
-"24 24 4 1",
-"      c None",
-".     c #000000000000",
-"X     c #E1E1E0E0E0E0",
-"O     c #FFFFFFFFFFFF",
-"                        ",
-"                        ",
-"                        ",
-"           ....         ",
-"          ..XXX..       ",
-"         ..XXXXX..      ",
-"       .O.XXXXXXX..     ",
-"     ..O.XXXXXXXXX..    ",
-"    .OO.XXXXXXXXXX...   ",
-"   .OO.XXXXXXXXXX.OO..  ",
-" ..OO.XXXXXXXXXX.OOOO.. ",
-" .....XXXXXXXXX.OOO.... ",
-" .OOO.XXXXXXXX.OO..OOO. ",
-" .OOOO...XXXXX...OOOOO. ",
-" .OOOOOOO..XX..OOOOOOO. ",
-" .OOOOOOO......OOOOOOO. ",
-" .OOOOOO.OO..O..OOOOOO. ",
-" .OOOOO.OOOOOOOO.OOOOO. ",
-" .OOOO.OOOOOOOOOO.OOOO. ",
-" .OOO.OOOOOOOOOOOO.OOO. ",
-" .O..OOOOOOOOOOOOOO..O. ",
-" ..OOOOOOOOOOOOOOOOOO.. ",
-" ...................... ",
-"                        "};
diff --git a/etc/images/gnus/rot13.pbm b/etc/images/gnus/rot13.pbm
deleted file mode 100644 (file)
index 800d9d6..0000000
Binary files a/etc/images/gnus/rot13.pbm and /dev/null differ
diff --git a/etc/images/gnus/rot13.xpm b/etc/images/gnus/rot13.xpm
deleted file mode 100644 (file)
index 18faa3e..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/* XPM */
-static char * rot13_xpm[] = {
-"24 24 101 2",
-"      g None",
-".     g #000000",
-"+     g #212121",
-"@     g #9E9E9E",
-"#     g #E6E6E6",
-"$     g #E7E7E7",
-"%     g #C8C8C8",
-"&     g #A0A0A0",
-"*     g #131313",
-"=     g #5F5F5F",
-"-     g #EDEDED",
-";     g #D6D6D6",
-">     g #D5D5D5",
-",     g #DDDDDD",
-"'     g #D8D8D8",
-")     g #A1A1A1",
-"!     g #3C3C3C",
-"~     g #353535",
-"{     g #EFEFEF",
-"]     g #CFCFCF",
-"^     g #4C4C4C",
-"/     g #141414",
-"(     g #6A6A6A",
-"_     g #D0D0D0",
-":     g #B2B2B2",
-"<     g #454545",
-"[     g #E2E2E2",
-"}     g #292929",
-"|     g #0F0F0F",
-"1     g #949494",
-"2     g #E9E9E9",
-"3     g #C3C3C3",
-"4     g #1C1C1C",
-"5     g #E1E1E1",
-"6     g #272727",
-"7     g #DEDEDE",
-"8     g #B6B6B6",
-"9     g #0C0C0C",
-"0     g #262626",
-"a     g #1F1F1F",
-"b     g #616161",
-"c     g #5B5B5B",
-"d     g #232323",
-"e     g #111111",
-"f     g #181818",
-"g     g #3D3D3D",
-"h     g #636363",
-"i     g #545454",
-"j     g #2E2E2E",
-"k     g #242424",
-"l     g #070707",
-"m     g #DCDCDC",
-"n     g #D3D3D3",
-"o     g #C5C5C5",
-"p     g #C2C2C2",
-"q     g #BFBFBF",
-"r     g #B5B5B5",
-"s     g #696969",
-"t     g #ACACAC",
-"u     g #999999",
-"v     g #8F8F8F",
-"w     g #868686",
-"x     g #686868",
-"y     g #B1B1B1",
-"z     g #9A9A9A",
-"A     g #909090",
-"B     g #878787",
-"C     g #DBDBDB",
-"D     g #A6A6A6",
-"E     g #979797",
-"F     g #8A8A8A",
-"G     g #8D8D8D",
-"H     g #838383",
-"I     g #666666",
-"J     g #BBBBBB",
-"K     g #9F9F9F",
-"L     g #8B8B8B",
-"M     g #828282",
-"N     g #676767",
-"O     g #A3A3A3",
-"P     g #8E8E8E",
-"Q     g #888888",
-"R     g #8C8C8C",
-"S     g #BABABA",
-"T     g #818181",
-"U     g #757575",
-"V     g #DADADA",
-"W     g #AFAFAF",
-"X     g #848484",
-"Y     g #7F7F7F",
-"Z     g #7B7B7B",
-"`     g #B8B8B8",
-" .    g #D9D9D9",
-"..    g #ABABAB",
-"+.    g #929292",
-"@.    g #939393",
-"#.    g #808080",
-"$.    g #919191",
-"%.    g #ADADAD",
-"&.    g #969696",
-"*.    g #4A4A4A",
-"                                                ",
-"                                                ",
-"                    . . . . .                   ",
-"                . + @ # $ % & *                 ",
-"              . = - # ; > , ' ) ! .             ",
-"              ~ { ] ^ . . / ( _ : <             ",
-"            . [ ' } .       | ( % 1 .           ",
-"            * 2 3 .           4 5 @ .           ",
-"            6 7 8 .           . $ 8 .           ",
-"        9 0 a b c d e 6 a f a g h i j k l       ",
-"        . 7 m ' ; n o p p p p q r r r s .       ",
-"        . 7 p 8 : t t t t t t t u v w x .       ",
-"        . m p 8 y t t t t t t t z A B s .       ",
-"        . C p r D E E E E E E A F G H I .       ",
-"        . , p 8 J t t t t t t t K L M N .       ",
-"        . m p y O E E E E E E P Q R H ( .       ",
-"        . m p r S t t t t t t t K L T U .       ",
-"        . V p W & E E E E E E F X B Y Z .       ",
-"        . C p y ` t t t t t t t K F B T .       ",
-"        .  .p W ..E E E E E E E +.G @.#..       ",
-"        . $.%.z &.A L F F G $.A A P X *..       ",
-"          . . . . . . . . . . . . . . .         ",
-"                                                ",
-"                                                "};
diff --git a/etc/images/gnus/save-aif.pbm b/etc/images/gnus/save-aif.pbm
deleted file mode 100644 (file)
index 15829c2..0000000
Binary files a/etc/images/gnus/save-aif.pbm and /dev/null differ
diff --git a/etc/images/gnus/save-aif.xpm b/etc/images/gnus/save-aif.xpm
deleted file mode 100644 (file)
index f0325ac..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * save_aif_xpm[] = {
-"24 24 6 1",
-"      c None",
-".     c #999999999999",
-"X     c #E1E1E0E0E0E0",
-"o     c #C7C7C6C6C6C6",
-"O     c #000000000000",
-"+     c #FFFFFFFFFFFF",
-"                        ",
-"                        ",
-"       .............    ",
-"       .XXXXXXXXXX.X..  ",
-"       .XXXXXXXXXX.XX.  ",
-"       .XXXXXXXXXX....  ",
-"       .XXXXXXXXXXooo.  ",
-"       .XXXXXXXXXXXXX.  ",
-"       .XXXXXXXXXXXXX.  ",
-"       .XXXXXXXXXXXXX.  ",
-" OOOOOOOOOOOOOOXXXXXX.  ",
-" O..O+++++++O.OXXXXXX.  ",
-" O..O+++++++O.OXXXXXX.  ",
-" O..O+++++++O.OXXXXXX.  ",
-" O..O+++++++O.OXXXXXX.  ",
-" O..O+++++++O.OXXXXXX.  ",
-" O..OOOOOOOOO.OXXXXXX.  ",
-" O............OXXXXXX.  ",
-" O............OXXXXXX.  ",
-" O..OOOOOOOOO.O.......  ",
-" O..OoooooO++.O         ",
-" O..OoooooO++.O         ",
-"  O.OoooooO++.O         ",
-"   OOOOOOOOOOOO         "};
diff --git a/etc/images/gnus/save-art.pbm b/etc/images/gnus/save-art.pbm
deleted file mode 100644 (file)
index 68fe0cb..0000000
Binary files a/etc/images/gnus/save-art.pbm and /dev/null differ
diff --git a/etc/images/gnus/save-art.xpm b/etc/images/gnus/save-art.xpm
deleted file mode 100644 (file)
index fe9726f..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * save_art_xpm[] = {
-"24 24 5 1",
-"      c None",
-".     c #000000000000",
-"X     c #FFFFFFFFFFFF",
-"o     c #999999999999",
-"O     c #C7C7C6C6C6C6",
-"                        ",
-"                        ",
-"     .................. ",
-"     ...XXXXXXXXXXXXX.. ",
-"     .XX..XXXXXXXXX..X. ",
-"     .XXXX..XXXXX..XXX. ",
-"     .XXXXX......XXXXX. ",
-"     .XXX..XX..XX..XXX. ",
-"     .XX..XXXXXXXX..XX. ",
-"     ...XXXXXXXXXXXX... ",
-" ..............XXXXXXX. ",
-" .oo.XXXXXXX.o......... ",
-" .oo.XXXXXXX.o.         ",
-" .oo.XXXXXXX.o.         ",
-" .oo.XXXXXXX.o.         ",
-" .oo.XXXXXXX.o.         ",
-" .oo.........o.         ",
-" .oooooooooooo.         ",
-" .oooooooooooo.         ",
-" .oo.........o.         ",
-" .oo.OOOOO.XXo.         ",
-" .oo.OOOOO.XXo.         ",
-"  .o.OOOOO.XXo.         ",
-"   ............         "};
diff --git a/etc/images/gnus/subscribe.pbm b/etc/images/gnus/subscribe.pbm
deleted file mode 100644 (file)
index fe6b392..0000000
Binary files a/etc/images/gnus/subscribe.pbm and /dev/null differ
diff --git a/etc/images/gnus/subscribe.xpm b/etc/images/gnus/subscribe.xpm
deleted file mode 100644 (file)
index ff193a9..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * subscribe_xpm[] = {
-"24 24 5 1",
-"      c None",
-".     c #A5A5A5A59595",
-"X     c #E1E1E0E0E0E0",
-"o     c #C7C7C6C6C6C6",
-"O     c #8686ADAD7D7D",
-"                        ",
-"                        ",
-"                        ",
-"     ...                ",
-"   ..XXX.....           ",
-"...XXXXX..XXX. ...      ",
-".X.XX...XXXX...XXX.     ",
-".XX.X.X.XX...XXXXX.     ",
-".XX...XX.X.X.XXXXXX.    ",
-".XX.o.XX...XX.XXXXXX.   ",
-".X.oo.XX.o.XX..XXXXXX.  ",
-"o.ooo.X.oo.XX.XXXOXXX.  ",
-"o.oXXo.ooo.X.oXXOXXXXX. ",
-" o.XXo.oXXo.ooXXOXXXXX. ",
-" o.XXXo.XXo.oXXXOXXXXXX.",
-"  o.XXo.XXXo.XOOOOXXXXX.",
-"  o.XXoo.XXo.XXXOOXXXXX.",
-"   o.XXo.XXXo.XXXXXXX...",
-"   o.XX.o.XXo.XXXXXX.oo ",
-"    o..oo.XX.o.XXX..o   ",
-"     oo  o..oo.XX.oo    ",
-"          oo  o..o      ",
-"               oo       ",
-"                        "};
diff --git a/etc/images/gnus/unimportant.pbm b/etc/images/gnus/unimportant.pbm
deleted file mode 100644 (file)
index 26a8721..0000000
Binary files a/etc/images/gnus/unimportant.pbm and /dev/null differ
diff --git a/etc/images/gnus/unimportant.xpm b/etc/images/gnus/unimportant.xpm
deleted file mode 100644 (file)
index 4298224..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char *magick[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 2  1",
-"! c blue",
-"w c Gray75",
-/* pixels */
-"wwwwwwwwwwwwwwwwwwwwwwww",
-"wwwwwwwwwwwwwwwwwwwwwwww",
-"wwwwwwwwwww!!!wwwwwwwwww",
-"wwwwwwwwwww!!!wwwwwwwwww",
-"wwwwwwwwwww!!!wwwwwwwwww",
-"wwwwwwwwwww!!!wwwwwwwwww",
-"wwwwwwwwwww!!!wwwwwwwwww",
-"wwwwwwwwwww!!!wwwwwwwwww",
-"wwwwwwwwwww!!!wwwwwwwwww",
-"wwwwwwwwwww!!!wwwwwwwwww",
-"wwwwwwwwwww!!!wwwwwwwwww",
-"wwwwwwwwwww!!!wwwwwwwwww",
-"ww!!!wwwwww!!!wwwwww!!!w",
-"www!!!wwwww!!!wwwww!!!ww",
-"wwww!!!wwww!!!wwww!!!www",
-"wwwww!!!www!!!www!!!wwww",
-"wwwwww!!!ww!!!ww!!!wwwww",
-"wwwwwww!!!w!!!w!!!wwwwww",
-"wwwwwwww!!!!!!!!!wwwwwww",
-"wwwwwwwww!!!!!!!wwwwwwww",
-"wwwwwwwwww!!!!!wwwwwwwww",
-"wwwwwwwwwww!!!wwwwwwwwww",
-"wwwwwwwwwwwwwwwwwwwwwwww",
-"wwwwwwwwwwwwwwwwwwwwwwww"
-};
diff --git a/etc/images/gnus/unsubscribe.pbm b/etc/images/gnus/unsubscribe.pbm
deleted file mode 100644 (file)
index 7d869fb..0000000
Binary files a/etc/images/gnus/unsubscribe.pbm and /dev/null differ
diff --git a/etc/images/gnus/unsubscribe.xpm b/etc/images/gnus/unsubscribe.xpm
deleted file mode 100644 (file)
index a91180d..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * unsubscribe_xpm[] = {
-"24 24 5 1",
-"      c None",
-".     c #A5A5A5A59595",
-"X     c #E1E1E0E0E0E0",
-"o     c #C7C7C6C6C6C6",
-"O     c #FFFF00000000",
-"                        ",
-"                        ",
-"                        ",
-"     ...                ",
-"   ..XXX.....           ",
-"...XXXXX..XXX. ...      ",
-".X.XX...XXXX...XXX.     ",
-".XX.X.X.XX...XXXXX.     ",
-".XX...XX.X.X.XXXXXX.    ",
-".XX.o.XX...XX.XXXXXX.   ",
-".X.oo.XX.o.XX..XXXXXX.  ",
-"o.ooo.X.oo.XX.XXXXXXX.  ",
-"o.oXXo.ooo.X.oXXXXXXXX. ",
-" o.XXo.oXXo.ooXXOXXXXX. ",
-" o.XXXo.XXo.oXXXOXXXXXX.",
-"  o.XXo.XXXo.XOOOXXXXXX.",
-"  o.XXoo.XXo.XoOOOXXXXX.",
-"   o.XXo.XXXo.XOoOXXX...",
-"   o.XX.o.XXo.XOXoXX.oo ",
-"    o..oo.XX.o.oXX..o   ",
-"     oo  o..oo.XX.oo    ",
-"          oo  o..o      ",
-"               oo       ",
-"                        "};
diff --git a/etc/images/gnus/uu-decode.pbm b/etc/images/gnus/uu-decode.pbm
deleted file mode 100644 (file)
index 2b7fada..0000000
Binary files a/etc/images/gnus/uu-decode.pbm and /dev/null differ
diff --git a/etc/images/gnus/uu-decode.xpm b/etc/images/gnus/uu-decode.xpm
deleted file mode 100644 (file)
index b9d940c..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* XPM */
-static char * uu_decode_xpm[] = {
-"24 24 9 1",
-"      c None",
-".     c #919187876969",
-"X     c #C2C2B9B99C9C",
-"o     c #868686868686",
-"O     c #8F8F8F8F8F8F",
-"+     c #000000000000",
-"@     c #4C4C4C4C4C4C",
-"#     c #E9E9EFEFE8E8",
-"$     c #8686ADAD7D7D",
-"                        ",
-"                        ",
-"                        ",
-"    ..............      ",
-"    X.o.........O.++    ",
-"    XX++++++++++..++    ",
-"    XX@########+..++    ",
-"    XX@########+..++    ",
-"    XX@$#$$$#$#+..++    ",
-"    XX@#$$$$$$#+..++    ",
-"    XX@##$#####+..++    ",
-"    XX@##$#$$##+..++    ",
-"    XX@##$#$$##+..++    ",
-"    XX@##$$#$$#+..++    ",
-"    XX@######$#+..++    ",
-"    XX@########+..++    ",
-"    XX@########+..++    ",
-"    XX.@@@@@@@@@..++    ",
-"    X.XXXXXXXXXX..++    ",
-"    .XXXXXXXXXXXX.++    ",
-"     +++++++++++++++    ",
-"     +++++++++++++++    ",
-"                        ",
-"                        "};
diff --git a/etc/images/gnus/uu-post.pbm b/etc/images/gnus/uu-post.pbm
deleted file mode 100644 (file)
index a5face7..0000000
Binary files a/etc/images/gnus/uu-post.pbm and /dev/null differ
diff --git a/etc/images/gnus/uu-post.xpm b/etc/images/gnus/uu-post.xpm
deleted file mode 100644 (file)
index 7c4204c..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * uu_post_xpm[] = {
-"24 24 8 1",
-".     c None",
-"X     c #000000000000",
-"+     c #C2C2B9B99C9C",
-"@     c #919187876969",
-"#     c #868686868686",
-"%     c #4C4C4C4C4C4C",
-"&     c #E9E9EFEFE8E8",
-"*     c #8686ADAD7D7D",
-"X..X..X..X.XX..X..X..X..",
-"..........X.X...........",
-".........X...X..........",
-"X..X..X.XX..X.XX..X..X..",
-".......X.......X........",
-"......X.........X.......",
-"X..X+X@@@@@@@@@@@XX..X..",
-"....+@@@@@@@@@@@@@......",
-"....++XXXXXXXXXX@@......",
-"X..X++%&&&&&&&&X@@X..X..",
-"....++%&&&&&&&&X@@......",
-"....++%*&***&*&X@@......",
-"X..X++%&******&X@@X..X..",
-"....++%&&*&&&&&X@@......",
-"....++%&&*&**&&X@@......",
-"X..X++%&&*&**&&X@@X..X..",
-"....++%&&**&**&X@@......",
-"....++%&&&&&&*&X@@......",
-"X..X++%&&&&&&&&X@@X..X..",
-"....++%&&&&&&&&X@@......",
-"....++@%%%%%%%%%@@......",
-"X..X+@++++++++++@@X..X..",
-"....+++++++++++++@......",
-"........................"};
index 697ce01343ae2ba7e099bce5a13d3b6682b26994..fc18d8a1c51563b544d3d880ea4a60af4862a246 100644 (file)
@@ -134,47 +134,8 @@ ARGS are passed to `message'."
                (const :tag "No map")
                (plist :inline t :tag "Properties"))))
 
-(define-widget 'gmm-tool-bar-zap-list 'lazy
-  "Tool bar zap list."
-  :tag "Tool bar zap list"
-  :type '(choice (const :tag "Zap all" t)
-                (const :tag "Keep all" nil)
-                (list
-                 ;; :value
-                 ;; Work around (bug in customize?), see
-                 ;; <news:v9is48jrj1.fsf@marauder.physik.uni-ulm.de>
-                 ;; (new-file open-file dired kill-buffer write-file
-                 ;;        print-buffer customize help)
-                 (set :inline t
-                      (const new-file)
-                      (const open-file)
-                      (const dired)
-                      (const kill-buffer)
-                      (const save-buffer)
-                      (const write-file)
-                      (const undo)
-                      (const cut)
-                      (const copy)
-                      (const paste)
-                      (const search-forward)
-                      (const print-buffer)
-                      (const customize)
-                      (const help))
-                 (repeat :inline t
-                         :tag "Other"
-                         (symbol :tag "Icon item")))))
-
-(defcustom gmm-tool-bar-style
-  (if (and (boundp 'tool-bar-mode)
-          tool-bar-mode
-          (not (memq (display-visual-class)
-                     (list 'static-gray 'gray-scale
-                           'static-color 'pseudo-color))))
-      'gnome
-    'retro)
-  "Preferred tool bar style."
-  :type '(choice (const :tag "GNOME style" gnome)
-                (const :tag "Retro look"  retro)))
+(defvar gmm-tool-bar-style 'gnome)
+(make-obsolete-variable 'gmm-tool-bar-style nil "29.1")
 
 (defvar tool-bar-map)
 
index 550f4e940a886e0a412fb91eff6b62a8adfe8e02..04d19e29a3ab9262dcf91e2cb3373990221ce962 100644 (file)
@@ -983,66 +983,36 @@ simple manner."
 
     (gnus-run-hooks 'gnus-group-menu-hook)))
 
-
 (defvar gnus-group-tool-bar-map nil)
 
-(defun gnus-group-tool-bar-update (&optional symbol value)
-  "Update group buffer toolbar.
-Setter function for custom variables."
-  (when symbol
-    (set-default symbol value))
-  ;; (setq-default gnus-group-tool-bar-map nil)
-  ;; (use-local-map gnus-group-mode-map)
-  (when (gnus-alive-p)
-    (with-current-buffer gnus-group-buffer
-      (gnus-group-make-tool-bar t))))
-
-(defcustom gnus-group-tool-bar (if (eq gmm-tool-bar-style 'gnome)
-                                  'gnus-group-tool-bar-gnome
-                                'gnus-group-tool-bar-retro)
-  "Specifies the Gnus group tool bar.
-
-It can be either a list or a symbol referring to a list.  See
-`gmm-tool-bar-from-list' for the format of the list.  The
-default key map is `gnus-group-mode-map'.
-
-Pre-defined symbols include `gnus-group-tool-bar-gnome' and
-`gnus-group-tool-bar-retro'."
-  :type '(choice (const :tag "GNOME style" gnus-group-tool-bar-gnome)
-                (const :tag "Retro look" gnus-group-tool-bar-retro)
-                (repeat :tag "User defined list" gmm-tool-bar-item)
-                (symbol))
-  :version "23.1" ;; No Gnus
-  :initialize 'custom-initialize-default
-  :set 'gnus-group-tool-bar-update
-  :group 'gnus-group)
-
-(defcustom gnus-group-tool-bar-gnome
+(defcustom gnus-group-tool-bar
   '((gnus-group-post-news "mail/compose")
     ;; Some useful agent icons?  I don't use the agent so agent users should
     ;; suggest useful commands:
-    (gnus-agent-toggle-plugged "unplugged" t
-                              :help "Gnus is currently unplugged.  Click to work online."
-                              :visible (and gnus-agent (not gnus-plugged)))
-    (gnus-agent-toggle-plugged "plugged" t
-                              :help "Gnus is currently plugged.  Click to work offline."
-                              :visible (and gnus-agent gnus-plugged))
-    ;; FIXME: gnus-agent-toggle-plugged (in gnus-agent-group-make-menu-bar)
-    ;; should have a better help text.
-    (gnus-group-send-queue "mail/outbox" t
-                          :visible (and gnus-agent gnus-plugged)
-                          :help "Send articles from the queue group")
-    (gnus-group-get-new-news "mail/inbox" nil
-                            :visible (or (not gnus-agent)
-                                         gnus-plugged))
-    ;; FIXME: gnus-*-read-group should have a better help text.
-    (gnus-topic-read-group "open" nil
-                          :visible (and (boundp 'gnus-topic-mode)
-                                        gnus-topic-mode))
-    (gnus-group-read-group "open" nil
-                          :visible (not (and (boundp 'gnus-topic-mode)
-                                             gnus-topic-mode)))
-    ;; (gnus-group-find-new-groups "???" nil)
+    (gnus-agent-toggle-plugged
+     "unplugged" t
+     :help "Gnus is currently unplugged.  Click to work online."
+     :visible (and gnus-agent (not gnus-plugged)))
+    (gnus-agent-toggle-plugged
+     "plugged" t
+     :help "Gnus is currently plugged.  Click to work offline."
+     :visible (and gnus-agent gnus-plugged))
+    (gnus-group-send-queue
+     "mail/outbox" t
+     :visible (and gnus-agent gnus-plugged)
+     :help "Send articles from the queue group")
+    (gnus-group-get-new-news
+     "mail/inbox" nil
+     :visible (or (not gnus-agent)
+                 gnus-plugged))
+    (gnus-topic-read-group
+     "open" nil
+     :visible (and (boundp 'gnus-topic-mode)
+                  gnus-topic-mode))
+    (gnus-group-read-group
+     "open" nil
+     :visible (not (and (boundp 'gnus-topic-mode)
+                       gnus-topic-mode)))
     (gnus-group-save-newsrc "save")
     (gnus-group-describe-group "describe")
     (gnus-group-toggle-subscription-at-point "gnus/toggle-subscription")
@@ -1051,44 +1021,22 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and
     (gnus-group-exit "exit")
     (gmm-customize-mode "preferences" t :help "Edit mode preferences")
     (gnus-info-find-node "help"))
-  "List of functions for the group tool bar (GNOME style).
-
-See `gmm-tool-bar-from-list' for the format of the list."
-  :type '(repeat gmm-tool-bar-item)
-  :version "23.1" ;; No Gnus
-  :initialize 'custom-initialize-default
-  :set 'gnus-group-tool-bar-update
-  :group 'gnus-group)
+  "Specifies the Gnus group tool bar.
 
-(defcustom gnus-group-tool-bar-retro
-  '((gnus-group-get-new-news "gnus/get-news")
-    (gnus-group-get-new-news-this-group "gnus/gnntg")
-    (gnus-group-catchup-current "gnus/catchup")
-    (gnus-group-describe-group "gnus/describe-group")
-    (gnus-group-subscribe "gnus/subscribe" t
-                         :help "Subscribe to the current group")
-    (gnus-group-unsubscribe "gnus/unsubscribe" t
-                           :help "Unsubscribe from the current group")
-    (gnus-group-exit "gnus/exit-gnus" gnus-group-mode-map))
-  "List of functions for the group tool bar (retro look).
-
-See `gmm-tool-bar-from-list' for the format of the list."
-  :type '(repeat gmm-tool-bar-item)
-  :version "23.1" ;; No Gnus
-  :initialize 'custom-initialize-default
-  :set 'gnus-group-tool-bar-update
+It can be either a list or a symbol referring to a list.  See
+`gmm-tool-bar-from-list' for the format of the list.  The
+default key map is `gnus-group-mode-map'."
+  :type '(choice (repeat :tag "User defined list" gmm-tool-bar-item)
+                (symbol))
+  :version "29.1"
   :group 'gnus-group)
 
-(defcustom gnus-group-tool-bar-zap-list t
-  "List of icon items from the global tool bar.
-These items are not displayed in the Gnus group mode tool bar.
-
-See `gmm-tool-bar-from-list' for the format of the list."
-  :type 'gmm-tool-bar-zap-list
-  :version "23.1" ;; No Gnus
-  :initialize 'custom-initialize-default
-  :set 'gnus-group-tool-bar-update
-  :group 'gnus-group)
+(defvar gnus-group-tool-bar-gnome nil)
+(make-obsolete-variable 'gnus-group-tool-bar-gnome nil "29.1")
+(defvar gnus-group-tool-bar-retro nil)
+(make-obsolete-variable 'gnus-group-tool-bar-retro nil "29.1")
+(defvar gnus-group-tool-bar-zap-list t)
+(make-obsolete-variable 'gnus-group-tool-bar-zap-list nil "29.1")
 
 (defvar image-load-path)
 (defvar tool-bar-map)
index d2221eb41c82f1cef0bc966b540a161525c2f581..a4f98c91573f9c8a505bcd00950ab283c4df8415 100644 (file)
@@ -2887,45 +2887,11 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs))))
 
 (defvar gnus-summary-tool-bar-map nil)
 
-;; Note: The :set function in the `gnus-summary-tool-bar*' variables will only
-;; affect _new_ message buffers.  We might add a function that walks thru all
-;; summary-mode buffers and force the update.
-(defun gnus-summary-tool-bar-update (&optional symbol value)
-  "Update summary mode toolbar.
-Setter function for custom variables."
-  (setq-default gnus-summary-tool-bar-map nil)
-  (when symbol
-    ;; When used as ":set" function:
-    (set-default symbol value))
-  (when (gnus-buffer-live-p gnus-summary-buffer)
-    (with-current-buffer gnus-summary-buffer
-      (gnus-summary-make-tool-bar))))
-
-(defcustom gnus-summary-tool-bar (if (eq gmm-tool-bar-style 'gnome)
-                                    'gnus-summary-tool-bar-gnome
-                                  'gnus-summary-tool-bar-retro)
-  "Specifies the Gnus summary tool bar.
-
-It can be either a list or a symbol referring to a list.  See
-`gmm-tool-bar-from-list' for the format of the list.  The
-default key map is `gnus-summary-mode-map'.
-
-Pre-defined symbols include `gnus-summary-tool-bar-gnome' and
-`gnus-summary-tool-bar-retro'."
-  :type '(choice (const :tag "GNOME style" gnus-summary-tool-bar-gnome)
-                (const :tag "Retro look"  gnus-summary-tool-bar-retro)
-                (repeat :tag "User defined list" gmm-tool-bar-item)
-                (symbol))
-  :version "23.1" ;; No Gnus
-  :initialize 'custom-initialize-default
-  :set 'gnus-summary-tool-bar-update
-  :group 'gnus-summary)
-
-(defcustom gnus-summary-tool-bar-gnome
+(defcustom gnus-summary-tool-bar
   '((gnus-summary-post-news "mail/compose" nil)
-    (gnus-summary-insert-new-articles "mail/inbox" nil
-                                     :visible (or (not gnus-agent)
-                                                  gnus-plugged))
+    (gnus-summary-insert-new-articles
+     "mail/inbox" nil
+     :visible (or (not gnus-agent) gnus-plugged))
     (gnus-summary-reply-with-original "mail/reply")
     (gnus-summary-reply "mail/reply" nil :visible nil)
     (gnus-summary-followup-with-original "mail/reply-all")
@@ -2935,17 +2901,10 @@ Pre-defined symbols include `gnus-summary-tool-bar-gnome' and
     (gnus-summary-search-article-forward "search" nil :visible nil)
     (gnus-summary-print-article "print")
     (gnus-summary-tick-article-forward "flag-followup" nil :visible nil)
-    ;; Some new commands that may need more suitable icons:
     (gnus-summary-save-newsrc "save" nil :visible nil)
-    ;; (gnus-summary-show-article "stock_message-display" nil :visible nil)
     (gnus-summary-prev-article "left-arrow")
     (gnus-summary-next-article "right-arrow")
     (gnus-summary-next-page "next-page")
-    ;; (gnus-summary-enter-digest-group "right_arrow" nil :visible nil)
-    ;;
-    ;; Maybe some sort-by-... could be added:
-    ;; (gnus-summary-sort-by-author "sort-a-z" nil :visible nil)
-    ;; (gnus-summary-sort-by-date "sort-1-9" nil :visible nil)
     (gnus-summary-mark-as-expirable
      "delete" nil
      :visible (gnus-check-backend-function 'request-expire-articles
@@ -2959,64 +2918,25 @@ Pre-defined symbols include `gnus-summary-tool-bar-gnome' and
      "mail/not-spam" nil
      :visible (and (fboundp 'spam-group-spam-contents-p)
                   (spam-group-spam-contents-p gnus-newsgroup-name)))
-    ;;
     (gnus-summary-exit "exit")
     (gmm-customize-mode "preferences" t :help "Edit mode preferences")
     (gnus-info-find-node "help"))
-  "List of functions for the summary tool bar (GNOME style).
-
-See `gmm-tool-bar-from-list' for the format of the list."
-  :type '(repeat gmm-tool-bar-item)
-  :version "23.1" ;; No Gnus
-  :initialize 'custom-initialize-default
-  :set 'gnus-summary-tool-bar-update
-  :group 'gnus-summary)
+  "Specifies the Gnus summary tool bar.
 
-(defcustom gnus-summary-tool-bar-retro
-  '((gnus-summary-prev-unread-article "gnus/prev-ur")
-    (gnus-summary-next-unread-article "gnus/next-ur")
-    (gnus-summary-post-news "gnus/post")
-    (gnus-summary-followup-with-original "gnus/fuwo")
-    (gnus-summary-followup "gnus/followup")
-    (gnus-summary-reply-with-original "gnus/reply-wo")
-    (gnus-summary-reply "gnus/reply")
-    (gnus-summary-caesar-message "gnus/rot13")
-    (gnus-uu-decode-uu "gnus/uu-decode")
-    (gnus-summary-save-article-file "gnus/save-aif")
-    (gnus-summary-save-article "gnus/save-art")
-    (gnus-uu-post-news "gnus/uu-post")
-    (gnus-summary-catchup "gnus/catchup")
-    (gnus-summary-catchup-and-exit "gnus/cu-exit")
-    (gnus-summary-exit "gnus/exit-summ")
-    ;; Some new command that may need more suitable icons:
-    (gnus-summary-print-article "gnus/print" nil :visible nil)
-    (gnus-summary-mark-as-expirable "gnus/close" nil :visible nil)
-    (gnus-summary-save-newsrc "gnus/save" nil :visible nil)
-    ;; (gnus-summary-enter-digest-group "gnus/right_arrow" nil :visible nil)
-    (gnus-summary-search-article-forward "gnus/search" nil :visible nil)
-    ;; (gnus-summary-insert-new-articles "gnus/paste" nil :visible nil)
-    ;; (gnus-summary-toggle-threads "gnus/open" nil :visible nil)
-    ;;
-    (gnus-info-find-node "gnus/help" nil :visible nil))
-  "List of functions for the summary tool bar (retro look).
-
-See `gmm-tool-bar-from-list' for the format of the list."
-  :type '(repeat gmm-tool-bar-item)
-  :version "23.1" ;; No Gnus
-  :initialize 'custom-initialize-default
-  :set 'gnus-summary-tool-bar-update
+It can be either a list or a symbol referring to a list.  See
+`gmm-tool-bar-from-list' for the format of the list.  The
+default key map is `gnus-summary-mode-map'."
+  :type '(choice (repeat :tag "User defined list" gmm-tool-bar-item)
+                (symbol))
+  :version "29.1"
   :group 'gnus-summary)
 
-(defcustom gnus-summary-tool-bar-zap-list t
-  "List of icon items from the global tool bar.
-These items are not displayed in the Gnus summary mode tool bar.
-
-See `gmm-tool-bar-from-list' for the format of the list."
-  :type 'gmm-tool-bar-zap-list
-  :version "23.1" ;; No Gnus
-  :initialize 'custom-initialize-default
-  :set 'gnus-summary-tool-bar-update
-  :group 'gnus-summary)
+(defvar gnus-summary-tool-bar-gnome nil)
+(make-obsolete-variable 'gnus-summary-tool-bar-gnome nil "29.1")
+(defvar gnus-summary-tool-bar-retro nil)
+(make-obsolete-variable 'gnus-summary-tool-bar-retro nil "29.1")
+(defvar gnus-summary-tool-bar-zap-list t)
+(make-obsolete-variable 'gnus-summary-tool-bar-zap-list nil "29.1")
 
 (defvar image-load-path)
 (defvar tool-bar-map)
index cc994d3ba59f8e0dfd5f1ab55b5f296d2f6bda3b..e7dc089a3c637c92fe5d762d75872802414b008b 100644 (file)
@@ -8167,39 +8167,7 @@ which specify the range to operate on."
 ;; Support for toolbar
 (defvar tool-bar-mode)
 
-;; Note: The :set function in the `message-tool-bar*' variables will only
-;; affect _new_ message buffers.  We might add a function that walks thru all
-;; message-mode buffers and force the update.
-(defun message-tool-bar-update (&optional symbol value)
-  "Update message mode toolbar.
-Setter function for custom variables."
-  (setq-default message-tool-bar-map nil)
-  (when symbol
-    ;; When used as ":set" function:
-    (set-default symbol value)))
-
-(defcustom message-tool-bar (if (eq gmm-tool-bar-style 'gnome)
-                               'message-tool-bar-gnome
-                             'message-tool-bar-retro)
-  "Specifies the message mode tool bar.
-
-It can be either a list or a symbol referring to a list.  See
-`gmm-tool-bar-from-list' for the format of the list.  The
-default key map is `message-mode-map'.
-
-Pre-defined symbols include `message-tool-bar-gnome' and
-`message-tool-bar-retro'."
-  :type '(repeat gmm-tool-bar-list-item)
-  :type '(choice (const :tag "GNOME style" message-tool-bar-gnome)
-                (const :tag "Retro look"  message-tool-bar-retro)
-                (repeat :tag "User defined list" gmm-tool-bar-item)
-                (symbol))
-  :version "23.1" ;; No Gnus
-  :initialize #'custom-initialize-default
-  :set #'message-tool-bar-update
-  :group 'message)
-
-(defcustom message-tool-bar-gnome
+(defcustom message-tool-bar
   '((ispell-message "spell" nil
                    :vert-only t
                    :visible (not flyspell-mode))
@@ -8215,47 +8183,23 @@ Pre-defined symbols include `message-tool-bar-gnome' and
     (message-insert-importance-high "important" nil :visible nil)
     (message-insert-importance-low "unimportant" nil :visible nil)
     (message-insert-disposition-notification-to "receipt" nil :visible nil))
-  "List of items for the message tool bar (GNOME style).
-
-See `gmm-tool-bar-from-list' for details on the format of the list."
-  :type '(repeat gmm-tool-bar-item)
-  :version "23.1" ;; No Gnus
-  :initialize #'custom-initialize-default
-  :set #'message-tool-bar-update
-  :group 'message)
+  "Specifies the message mode tool bar.
 
-(defcustom message-tool-bar-retro
-  '(;; Old Emacs 21 icon for consistency.
-    (message-send-and-exit "mail/send")
-    (message-kill-buffer "close")
-    (message-dont-send "cancel")
-    (mml-attach-file "attach" mml-mode-map)
-    (ispell-message "spell")
-    (mml-preview "preview" mml-mode-map)
-    (message-insert-importance-high "gnus/important")
-    (message-insert-importance-low "gnus/unimportant")
-    (message-insert-disposition-notification-to "gnus/receipt"))
-  "List of items for the message tool bar (retro style).
-
-See `gmm-tool-bar-from-list' for details on the format of the list."
-  :type '(repeat gmm-tool-bar-item)
-  :version "23.1" ;; No Gnus
-  :initialize #'custom-initialize-default
-  :set #'message-tool-bar-update
+It can be either a list or a symbol referring to a list.  See
+`gmm-tool-bar-from-list' for the format of the list.  The
+default key map is `message-mode-map'."
+  :type '(repeat gmm-tool-bar-list-item)
+  :type '(choice (repeat :tag "User defined list" gmm-tool-bar-item)
+                (symbol))
+  :version "29.1"
   :group 'message)
 
-(defcustom message-tool-bar-zap-list
-  '(new-file open-file dired kill-buffer write-file
-            print-buffer customize help)
-  "List of icon items from the global tool bar.
-These items are not displayed on the message mode tool bar.
-
-See `gmm-tool-bar-from-list' for the format of the list."
-  :type 'gmm-tool-bar-zap-list
-  :version "23.1" ;; No Gnus
-  :initialize #'custom-initialize-default
-  :set #'message-tool-bar-update
-  :group 'message)
+(defvar message-tool-bar-gnome nil)
+(make-obsolete-variable 'message-tool-bar-gnome nil "29.1")
+(defvar message-tool-bar-retro nil)
+(make-obsolete-variable 'message-tool-bar-gnome nil "29.1")
+(defvar message-tool-bar-zap-list t)
+(make-obsolete-variable 'message-tool-bar-zap-list nil "29.1")
 
 (defvar image-load-path)
 (declare-function image-load-path-for-library "image"