User: youngs
Date: 06/03/16 05:19:53
Modified: packages/xemacs-packages/gnus/texi ChangeLog.upstream
emacs-mime.texi gnus.texi message.texi
Added: packages/xemacs-packages/gnus/etc/gnus attach.xpm
compose.xpm connect.xpm contact.xpm copy.xpm
delete.xpm describe.xpm disconnect.xpm exit.xpm
forward.xpm inbox.xpm lock-broken.xpm lock-ok.xpm
lock.xpm move.xpm next-page.xpm not-spam.xpm
outbox.xpm refresh.xpm reply-all.xpm save-draft.xpm
save.xpm send.xpm separator.xpm sort-ascending.xpm
sort-column-ascending.xpm sort-criteria.xpm
sort-descending.xpm sort-row-ascending.xpm spam.xpm
toggle-subscription.xpm
Log:
* Sync with upstream stable branch.
Please see the ChangeLog.upstream files for details.
Revision Changes Path
1.100 +5 -0 XEmacs/packages/xemacs-packages/gnus/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- ChangeLog 2006/01/04 07:45:56 1.99
+++ ChangeLog 2006/03/16 04:16:56 1.100
@@ -1,3 +1,8 @@
+2006-03-16 Steve Youngs <steve(a)sxemacs.org>
+
+ * Sync with upstream stable branch.
+ Please see the ChangeLog.upstream files for details.
+
2006-01-04 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.89 released.
1.5 +3 -2 XEmacs/packages/xemacs-packages/gnus/etc/gnus-tut.txt
Index: gnus-tut.txt
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/etc/gnus-tut.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-tut.txt 2005/11/15 03:45:40 1.4
+++ gnus-tut.txt 2006/03/16 04:17:03 1.5
@@ -25,7 +25,8 @@ Ingebrigtsen. If you have a WWW browser
heart's delight at <
URL:http://www.gnus.org/> and
<
URL:http://quimby.gnus.org/lmi/>.
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)ifi.uio.no>
;; Keywords: news
@@ -223,7 +224,7 @@ want this is beyond me, but here goes:
Create the group by saying
-`G V my.virtual.newsgroup<RET>nnvirtual<RET>^rec\.aquaria\.*<RET>'
+`G m my.virtual.newsgroup<RET>nnvirtual<RET>^rec\.aquaria\.*<RET>'
This will create the group "nnvirtual:my.virtual.newsgroup", which
will collect all articles from all the groups in the "rec.aquaria"
1.2 +177 -32 XEmacs/packages/xemacs-packages/gnus/etc/gnus/preview.xpm
Index: preview.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/etc/gnus/preview.xpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- preview.xpm 2003/05/02 00:26:58 1.1
+++ preview.xpm 2006/03/16 04:17:11 1.2
@@ -1,33 +1,178 @@
/* XPM */
-static char *prev1[]={
-"24 24 6 1",
-". c None",
-"# c #000000",
-"d c #46463e",
-"a c #676663",
-"c c #a8a7a3",
-"b c #ebeae4",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"..............####......",
-".........#####abbc#.....",
-"....#####acbbbbbbc#.....",
-"...#acbbbbbbbbbbacc#....",
-"...#baabbbbbbbbcacb#....",
-"...#cbcaabbd##dacbb#....",
-"....#bbbccdcbbcdabbc#...",
-"....#bbbbdccaaccdacb#...",
-"....#cbbb#abbbbb#bac#...",
-".....#bbb#cbbbbc#bbac#..",
-".....#bbbdcbbbbddbbc##..",
-".....#cbccdcbbd#####....",
-"......#babbd##dd##......",
-"......#acbc###.####.....",
-"......#aa##......###....",
-".......##.........###...",
-"...................##...",
-"........................",
-"........................"};
+static char * mail_preview_xpm[] = {
+"24 24 151 2",
+" c None",
+". c #343434",
+"+ c #2D2D2D",
+"@ c #292929",
+"# c #262626",
+"$ c #2E2E2E",
+"% c #303030",
+"& c #737373",
+"* c #A1A1A1",
+"= c #B4B4B4",
+"- c #B2B2B2",
+"; c #9D9D9D",
+"> c #676767",
+", c #202020",
+"' c #1C1C1C",
+") c #272727",
+"! c #616161",
+"~ c #CACACA",
+"{ c #CFCFCF",
+"] c #D0D0D0",
+"^ c #CECECE",
+"/ c #C9C9C9",
+"( c #C1C1C1",
+"_ c #A7A7A7",
+": c #4C4C4C",
+"< c #131313",
+"[ c #222222",
+"} c #757575",
+"| c #D3D3D3",
+"1 c #DBDBDB",
+"2 c #E7E7E7",
+"3 c #EFEFEF",
+"4 c #F3F3F3",
+"5 c #F1F1F1",
+"6 c #E5E5E5",
+"7 c #D2D2D2",
+"8 c #BCBCBC",
+"9 c #5E5E5E",
+"0 c #101010",
+"a c #212121",
+"b c #5B5B5B",
+"c c #CCCCCC",
+"d c #D7D7D7",
+"e c #F5F5F5",
+"f c #FAFAFA",
+"g c #FBFBFB",
+"h c #F8F8F8",
+"i c #F0F0F0",
+"j c #E1E1E1",
+"k c #C2C2C2",
+"l c #434343",
+"m c #0F0F0F",
+"n c #1F1F1F",
+"o c #B9B9B9",
+"p c #D4D4D4",
+"q c #F7F7F7",
+"r c #F9F9F9",
+"s c #F6F6F6",
+"t c #EAEAEA",
+"u c #E2E2E2",
+"v c #ABABAB",
+"w c #0E0E0E",
+"x c #000000",
+"y c #111111",
+"z c #686868",
+"A c #9C9C9C",
+"B c #808080",
+"C c #8E8E8E",
+"D c #919191",
+"E c #929292",
+"F c #949494",
+"G c #939393",
+"H c #8B8B8B",
+"I c #838383",
+"J c #A3A3A3",
+"K c #555555",
+"L c #080808",
+"M c #535353",
+"N c #333333",
+"O c #AFAFAF",
+"P c #E6E6E6",
+"Q c #FDFDFD",
+"R c #FEFEFE",
+"S c #FCFCFC",
+"T c #A8A8A8",
+"U c #8D8D8D",
+"V c #050505",
+"W c #EEEEEE",
+"X c #A6A6A6",
+"Y c #C8C8C8",
+"Z c #FFFFFF",
+"` c #B6B6B6",
+" . c #F4F4F4",
+".. c #F2F2F2",
+"+. c #A9A9A9",
+"@. c #040404",
+"#. c #2A2A2A",
+"$. c #AAAAAA",
+"%. c #ECECEC",
+"&. c #A5A5A5",
+"*. c #C7C7C7",
+"=. c #D8D8D8",
+"-. c #CDCDCD",
+";. c #858585",
+">. c #010101",
+",. c #606060",
+"'. c #646464",
+"). c #C3C3C3",
+"!. c #DADADA",
+"~. c #494949",
+"{. c #ADADAD",
+"]. c #0A0A0A",
+"^. c #BABABA",
+"/. c #DCDCDC",
+"(. c #989898",
+"_. c #E9E9E9",
+":. c #EBEBEB",
+"<. c #A4A4A4",
+"[. c #B7B7B7",
+"}. c #D1D1D1",
+"|. c #414141",
+"1. c #3D3D3D",
+"2. c #969696",
+"3. c #A0A0A0",
+"4. c #BEBEBE",
+"5. c #D9D9D9",
+"6. c #C5C5C5",
+"7. c #515151",
+"8. c #C0C0C0",
+"9. c #959595",
+"0. c #DDDDDD",
+"a. c #484848",
+"b. c #030303",
+"c. c #454545",
+"d. c #060606",
+"e. c #B5B5B5",
+"f. c #C6C6C6",
+"g. c #C4C4C4",
+"h. c #A2A2A2",
+"i. c #828282",
+"j. c #1E1E1E",
+"k. c #191919",
+"l. c #7C7C7C",
+"m. c #E4E4E4",
+"n. c #9E9E9E",
+"o. c #525252",
+"p. c #B0B0B0",
+"q. c #6C6C6C",
+"r. c #565656",
+"s. c #797979",
+"t. c #3A3A3A",
+" ",
+" ",
+" . + @ # # # ",
+" $ % & * = - ; > , ' ",
+" ) ! = ~ { ] ^ / ( _ : < ",
+" [ } ~ | 1 2 3 4 5 6 7 8 9 0 ",
+" a b c d 6 e f g f h e i j k l m ",
+" n o p 6 q r g g f r s i t u v w ",
+" x y z A B C D E F F G G D C H I J K L ",
+"x M N O P e r g Q R R Q S f h e i T U V ",
+"x W y ~ t 5 q q g r S r f q e i X Y _ V ",
+"x Z y ` t 3 4 e s q q q s ...+.~ ] J @. ",
+"x Z #.$.v %.i .. .e e e 4 5 &.*.=.-.;.>. ",
+"x Z ,.'.1 ; %.3 i 5 5 i i T ).=.!./ ~.x ",
+"x Z {.].^./.(._.:.%.%.%.<.[.}.!.p &.>. ",
+"x Z /.|.1.7 +.2.6 6 6 3.$.4.=.5.).% x ",
+"x Z e 6.L 7.8.( 9.0.(.= Y J ).( a.b.x ",
+"x Z g d c.d.. 3.( F e.8.~ f.U + b.].x x ",
+"x Z e & ^.g.1.b.a.I h.&.i.l x j.[.k.x x x ",
+"x Z l.p m.m.Y n.o.j.b.b.j.o.n.p.q.O j.n x x ",
+"x & 8 8 8 8 8 8 &.&.&.&.&.&.&.8 8 r.x > N x x
",
+" x x x x x x x x x x x x x x x x x x x s.t.x x ",
+" x z n x ",
+" x x "};
1.2 +88 -25 XEmacs/packages/xemacs-packages/gnus/etc/gnus/reply.xpm
Index: reply.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/etc/gnus/reply.xpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- reply.xpm 2003/05/02 00:26:58 1.1
+++ reply.xpm 2006/03/16 04:17:11 1.2
@@ -1,31 +1,94 @@
/* XPM */
-static char * reply_xpm[] = {
-"24 24 4 1",
+static char * stock_mail_reply_xpm[] = {
+"24 24 67 1",
" c None",
-". c #000000000000",
-"X c #E1E1E0E0E0E0",
-"O c #FFFFFFFFFFFF",
+". c #000000",
+"+ c #535353",
+"@ c #FFFFFF",
+"# c #FEFEFE",
+"$ c #FDFDFD",
+"% c #FCFCFC",
+"& c #FBFBFB",
+"* c #F9F9F9",
+"= c #F8F8F8",
+"- c #F7F7F7",
+"; c #F6F6F6",
+"> c #F5F5F5",
+", c #F4F4F4",
+"' c #E3E3E3",
+") c #EEEEEE",
+"! c #4F4F4F",
+"~ c #F3F3F3",
+"{ c #F2F2F2",
+"] c #F1F1F1",
+"^ c #F0F0F0",
+"/ c #EFEFEF",
+"( c #EDEDED",
+"_ c #AEAEAE",
+": c #E4E4E4",
+"< c #434343",
+"[ c #ACACAC",
+"} c #C8C8C8",
+"| c #A0A0A0",
+"1 c #D4D4D4",
+"2 c #ECECEC",
+"3 c #959595",
+"4 c #3E3E3E",
+"5 c #4D4D4D",
+"6 c #818181",
+"7 c #C6C6C6",
+"8 c #3D1A13",
+"9 c #6A6A6A",
+"0 c #636363",
+"a c #B9B9B9",
+"b c #737373",
+"c c #EAC0BA",
+"d c #7C7C7C",
+"e c #DF9E95",
+"f c #E0A198",
+"g c #E1A59D",
+"h c #E2A79E",
+"i c #E3ABA3",
+"j c #E3AAA2",
+"k c #CC6253",
+"l c #DD978D",
+"m c #DF9F97",
+"n c #DE9A90",
+"o c #DD968C",
+"p c #DD948A",
+"q c #B14334",
+"r c #BCBCBC",
+"s c #431913",
+"t c #EAC2BC",
+"u c #DF9C92",
+"v c #DD998F",
+"w c #B54535",
+"x c #65261D",
+"y c #983A2C",
+"z c #7C2F24",
+"A c #63251D",
+"B c #6C291F",
" ",
" ",
" ",
-" .... ",
-" ..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.. ",
-" ...................... ",
+" ................. ",
+" .+@@@@#$%&*=-;>,'+. ",
+" .)!@>,~{{]^^/)('!_. ",
+" .@:<$~{{]^/))('![}. ",
+" .@>:!&]^^/)(('<|1}. ",
+" .@&>:<=^/)(2'!31:}. ",
+" .@>>>:4>)(2'567::}. ",
+" .@&8>:9<~2'!977>:}. ",
+" .@..:0@a!^!37b7>:}. ",
+" ..c.0@>:1![7::d::}. ",
+" .ce.......:>>>:d:}. ",
+" .cfghihjek.::::::d}. ",
+" .clmenoonpq.rrrrrrr0. ",
+"stnuvvlnnnnw.......... ",
+" .xyyyyyyyyz. ",
+" .xyyAAAAAB. ",
+" .xy....... ",
+" .x. ",
+" .. ",
+" . ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/attach.xpm
Index: attach.xpm
===================================================================
/* XPM */
static char * stock_attach_xpm[] = {
"24 24 99 2",
" c None",
". c #000000",
"+ c #010101",
"@ c #515151",
"# c #9A9A9A",
"$ c #CFCFCF",
"% c #6F6F6F",
"& c #464646",
"* c #A5A5A5",
"= c #E2E2E2",
"- c #FFFFFF",
"; c #F6F6F6",
"> c #8A8A8A",
", c #393939",
"' c #1C1C1C",
") c #8B8B8B",
"! c #E6E6E6",
"~ c #EEEEEE",
"{ c #E1E1E1",
"] c #F8F8F8",
"^ c #F7F7F7",
"/ c #CCCCCC",
"( c #565656",
"_ c #3E3E3E",
": c #818181",
"< c #D4D4D4",
"[ c #E7E7E7",
"} c #D7D7D7",
"| c #FAFAFA",
"1 c #F9F9F9",
"2 c #C2C2C2",
"3 c #CBCBCB",
"4 c #F5F5F5",
"5 c #D9D9D9",
"6 c #030303",
"7 c #545454",
"8 c #DEDEDE",
"9 c #B3B3B3",
"0 c #797979",
"a c #F4F4F4",
"b c #9D9D9D",
"c c #282828",
"d c #FBFBFB",
"e c #A6A6A6",
"f c #C5C5C5",
"g c #F0F0F0",
"h c #CACACA",
"i c #C7C7C7",
"j c #F2F2F2",
"k c #CECECE",
"l c #C4C4C4",
"m c #D5D5D5",
"n c #DADADA",
"o c #F3F3F3",
"p c #858585",
"q c #BEBEBE",
"r c #D3D3D3",
"s c #DCDCDC",
"t c #9C9C9C",
"u c #484848",
"v c #A7A7A7",
"w c #D6D6D6",
"x c #C8C8C8",
"y c #C6C6C6",
"z c #4C4C4C",
"A c #EAEAEA",
"B c #E5E5E5",
"C c #D8D8D8",
"D c #ADADAD",
"E c #BCBCBC",
"F c #E0E0E0",
"G c #F1F1F1",
"H c #909090",
"I c #686868",
"J c #A2A2A2",
"K c #C0C0C0",
"L c #C1C1C1",
"M c #787878",
"N c #AEAEAE",
"O c #151515",
"P c #D0D0D0",
"Q c #979797",
"R c #727272",
"S c #4A4A4A",
"T c #ECECEC",
"U c #ACACAC",
"V c #BABABA",
"W c #DDDDDD",
"X c #DBDBDB",
"Y c #B1B1B1",
"Z c #232323",
"` c #696969",
" . c #B7B7B7",
".. c #828282",
"+. c #404040",
"@. c #969696",
"#. c #323232",
"$. c #E8E8E8",
"%. c #121212",
" ",
" . . . . . ",
" . . . . ",
" . + @ # $ % . ",
" . . & * = - - ; > , ",
" . ' ) ! ~ { - ] ^ ; / ( ",
" . _ : < ' [ } | 1 ] 2 3 4 5 : . ",
" 6 7 ! - - - . } 8 9 0 . = ; 4 a b c ",
" . ; - - | | d . e f g ] . = 2 h a i ( ",
" . j ] 1 k l f . m 1 ] ] . 9 n a o o 0 . ",
" p - ] q 1 1 . r s 2 2 . = 4 a o j t c ",
" u - ^ ^ ] ] . v w ^ ; . = a l x j y z ",
" . A - ; q 2 . B C ; 4 . D E A F G A H . ",
" I - 4 ; ; J . K L . M w o j G G m N O ",
" , - a 4 4 n # . . 0 w j j G w P Q R S ",
" . T - a U V W o k X T } w Y : ( Z . ",
" ` - o o o o j j } ...+.Z . . ",
" c - o j j } q @.#.Z . ",
" . ! $./ # +.Z . . ",
" , .., %.. ",
" . . ",
" ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/compose.xpm
Index: compose.xpm
===================================================================
/* XPM */
static char * stock_mail_compose_xpm[] = {
"24 24 198 2",
" c None",
". c #000000",
"+ c #D1AF61",
"@ c #F1E3AC",
"# c #FBA90F",
"$ c #FFFFFF",
"% c #B5B5B5",
"& c #A06B09",
"* c #816000",
"= c #E0E0E0",
"- c #C1C1C1",
"; c #F4F4F4",
"> c #FDFDFD",
", c #E6C370",
"' c #F1D387",
") c #D58F0C",
"! c #B2B2B2",
"~ c #C3C3C3",
"{ c #FBFBFB",
"] c #A8A8A8",
"^ c #F6F6F6",
"/ c #B3B3B3",
"( c #FAFAFA",
"_ c #ADADAD",
": c #767676",
"< c #5D5D5D",
"[ c #404040",
"} c #F8F8F8",
"| c #F1D07E",
"1 c #ACACAC",
"2 c #F8F8F6",
"3 c #E2E2E2",
"4 c #858585",
"5 c #4B4B49",
"6 c #161616",
"7 c #FBFBFA",
"8 c #7D7D7D",
"9 c #F2F2F2",
"0 c #F0F0F0",
"a c #EFEFEF",
"b c #D5D5D5",
"c c #F9F9F9",
"d c #F6F6F3",
"e c #F3F3F3",
"f c #878786",
"g c #E5E5E5",
"h c #DFDFDF",
"i c #EBEBEB",
"j c #AEAEAE",
"k c #7B5307",
"l c #EDEDED",
"m c #EBEBE9",
"n c #E9E9E7",
"o c #E0E0DE",
"p c #BFBFBF",
"q c #F0F0ED",
"r c #F1D284",
"s c #CA870B",
"t c #9E9E9C",
"u c #DCDCD9",
"v c #D9D9D9",
"w c #D9D9D6",
"x c #D6D6D4",
"y c #E5E5E4",
"z c #D9D9D7",
"A c #BABABA",
"B c #AAAAAA",
"C c #E7E7E5",
"D c #E4E4E2",
"E c #E2E2E0",
"F c #EEEEEC",
"G c #979796",
"H c #D4D4D1",
"I c #DEDEDC",
"J c #DEDEDB",
"K c #BDBDBC",
"L c #E7E7E7",
"M c #EFEFED",
"N c #A6A6A5",
"O c #BA7C0A",
"P c #7A5B00",
"Q c #DBDBD9",
"R c #D5D5D3",
"S c #BCBCBC",
"T c #E3E3E3",
"U c #F2E6B6",
"V c #7B7B7B",
"W c #704B05",
"X c #676764",
"Y c #CBCBC7",
"Z c #C9C9C7",
"` c #DBDBD7",
" . c #D7D7D5",
".. c #D7D7D3",
"+. c #B4B4B4",
"@. c #E4E4E4",
"#. c #DBD5C1",
"$. c #7E6F57",
"%. c #755800",
"&. c #D9D9D5",
"*. c #D5D5D1",
"=. c #D0D0CE",
"-. c #BABAB8",
";. c #DDDDDB",
">. c #D1D1CF",
",. c #0E0E0E",
"'. c #535353",
"). c #8D8D8B",
"!. c #C4C4C1",
"~. c #C4C4BF",
"{. c #C1C1BC",
"]. c #D3D3D0",
"^. c #D1D1D0",
"/. c #DCDCDB",
"(. c #E0E0DC",
"_. c #898987",
":. c #C9C9C6",
"<. c #CDCDCA",
"[. c #D0D0CD",
"}. c #CECECB",
"|. c #CFCFCC",
"1. c #D0D0CC",
"2. c #B6B6B6",
"3. c #D4D4D0",
"4. c #C3C3C0",
"5. c #5B5B5B",
"6. c #91918D",
"7. c #91918F",
"8. c #9F9F9D",
"9. c #AFAFAC",
"0. c #B9B9B6",
"a. c #BEBEBB",
"b. c #C5C5C2",
"c. c #C8C8C5",
"d. c #CACAC7",
"e. c #CBCBC8",
"f. c #CCCCC9",
"g. c #CCCCC8",
"h. c #D2D2D0",
"i. c #D2D2CF",
"j. c #BFBFBD",
"k. c #9F9F9C",
"l. c #888886",
"m. c #878785",
"n. c #8C8C8A",
"o. c #959593",
"p. c #9C9C9A",
"q. c #A8A8A5",
"r. c #B1B1AE",
"s. c #B5B5B3",
"t. c #BBBBB8",
"u. c #BFBFBC",
"v. c #C2C2BE",
"w. c #D1D1CE",
"x. c #AEAEAB",
"y. c #9D9D9A",
"z. c #979794",
"A. c #949491",
"B. c #9A9A97",
"C. c #A3A3A0",
"D. c #AAAAA7",
"E. c #B0B0AC",
"F. c #B8B8B5",
"G. c #B0B0AE",
"H. c #CFCFCD",
"I. c #BEBEBC",
"J. c #B4B4B0",
"K. c #ACACA8",
"L. c #A4A4A2",
"M. c #A0A09C",
"N. c #A4A4A0",
"O. c #A8A8A6",
"P. c #ABABA7",
"Q. c #B2B2AE",
"R. c #A4A4A4",
"S. c #CECECC",
"T. c #CECECA",
"U. c #C6C6C2",
"V. c #BCBCB9",
"W. c #B3B3AF",
"X. c #ABABA9",
"Y. c #A6A6A3",
"Z. c #A0A09D",
"`. c #ACACA9",
" + c #A1A1A1",
".+ c #B1B1AF",
"++ c #B4B4B3",
"@+ c #B4B4B1",
"#+ c #B3B3B1",
"$+ c #AEAEAA",
"%+ c #A7A7A4",
"&+ c #A2A2A0",
"*+ c #A5A5A1",
"=+ c #999997",
"-+ c #929290",
";+ c #949490",
">+ c #9D9D9B",
",+ c #858583",
" . . . ",
" . . . . . . . . . . . . + @ # . . . ",
" . $ $ $ $ $ $ $ $ $ % & @ # * . = - . ",
" . $ ; $ $ $ $ $ > > . , ' ) . ! ~ { ] . ",
" . $ ^ $ $ $ > > > / & @ # * . ( _ : < [ . ",
" . $ ^ $ { { { { } . , | ) . 1 2 3 4 5 6 . ",
" . $ ; > > { { 7 8 & @ # * . ; 9 0 a b _ . ",
" . $ 9 c ^ ^ d e . , | ) . f g 3 h i 3 - . ",
" . $ 0 } } } 2 j k @ # * . l i m n n o p . ",
" . $ a e 0 q l . , r s . t u v w x y z A . ",
" . $ l ; ; 9 B & @ # * . C y y D o E z A . ",
" . $ i F C g . , r s . G H E o I J I z K . ",
" . $ L M i N O # # P . E o I J u Q Q R S . ",
" . $ g T v . U V W . X Y Z u ` z .z ..+.. ",
" . $ E y @.. #.$.%.. u Q ` &...R *...=.-.. ",
" . $ I ;.>.,.'.. . ).!.~.{.*.*.].^.].=.-.. ",
" . $ /.(.;.. . _.:.<.[.}.[.[.[.[.|.[.1.2.. ",
" . $ Q 3.4.5.6.7.8.9.0.a.4.b.c.d.e.f.g.! . ",
" . $ h.i.|.j.k.l.m.n.o.p.q.r.s.t.a.u.v.! . ",
" . $ w.1.f.|.4.x.y.z.z.A.B.k.C.q.D.E.F.G.. ",
" . $ i.w.w.w.H.e.I.J.K.L.M.M.N.L.O.P.Q.R.. ",
" . $ ^.w.=.S.T.T.g.U.V.W.J.X.Y.Z.Y.D.`. +. ",
" . $ .+++@+@+(a)+#+#+Q.$+%+&+*+*+=+-+;+>+,+. ",
" . . . . . . . . . . . . . . . . . . . . "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/connect.xpm
Index: connect.xpm
===================================================================
/* XPM */
static char * stock_connect_xpm[] = {
"24 24 58 1",
" c None",
". c #000000",
"+ c #989389",
"@ c #807D74",
"# c #C6C2BA",
"$ c #34332D",
"% c #B7B3AA",
"& c #C4C2BD",
"* c #EAE8E3",
"= c #9C978D",
"- c #BCB9B2",
"; c #363433",
"> c #E2E1DD",
", c #F0EFEC",
"' c #AAA7A0",
") c #F0EEEB",
"! c #B2B0AB",
"~ c #F9F9F8",
"{ c #C5C3BD",
"] c #0F0F0D",
"^ c #F2F0ED",
"/ c #EBEAE6",
"( c #8A857B",
"_ c #ECEBE8",
": c #EEECEA",
"< c #9F9C93",
"[ c #F3F2F0",
"} c #E8E7E4",
"| c #E3E1DD",
"1 c #78756B",
"2 c #BEBBB5",
"3 c #B3B1AA",
"4 c #7D786E",
"5 c #E1DFDB",
"6 c #D1D0CC",
"7 c #938E84",
"8 c #C8C5BF",
"9 c #A7A298",
"0 c #010101",
"a c #8C8981",
"b c #A6A29B",
"c c #726D63",
"d c #CECAC3",
"e c #A7A49E",
"f c #7E7A70",
"g c #A09D94",
"h c #817D73",
"i c #6C685E",
"j c #3C3933",
"k c #8B877E",
"l c #706C62",
"m c #B1ADA4",
"n c #97938A",
"o c #625E54",
"p c #6A655B",
"q c #37342D",
"r c #646056",
"s c #8B877D",
" ",
" ",
" ",
" ",
" ",
" ",
" .. .. ",
" ..+@.#@.. ",
" $%&*@.*@=-; ",
" .>,'*@.)@!~{] ",
"......@>,'*@.)@!~{@.....",
"*******^/(_@.:@<[}|*****",
"@@@@@1123451.6@789@@@@@(a)",
".....01abcd1.e@fghi.....",
" ]abcd1.e@fgh] ",
" ]jklmi.n@opq. ",
" ]]+r.s@.. ",
" ]] ]. ",
" ",
" ",
" ",
" ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/contact.xpm
Index: contact.xpm
===================================================================
/* XPM */
static char * stock_contact_xpm[] = {
"24 24 102 2",
" c None",
". c #000000",
"+ c #E3E1DE",
"@ c #ECEBE7",
"# c #F0EEEB",
"$ c #D2CFC9",
"% c #81817F",
"& c #4C4C4A",
"* c #ECEAE6",
"= c #ECEAE5",
"- c #EBE9E5",
"; c #D2CEC8",
"> c #D9C7B8",
", c #D9C7B9",
"' c #D8C5B8",
") c #D1C0B3",
"! c #D6C5B7",
"~ c #EBEAE5",
"{ c #D3D0C9",
"] c #CDBCAC",
"^ c #AFA093",
"/ c #3A3531",
"( c #443F3A",
"_ c #AE9F93",
": c #CBBAAB",
"< c #4E4E4C",
"[ c #595957",
"} c #595857",
"| c #7D7C7A",
"1 c #D3D0CA",
"2 c #C6B5A4",
"3 c #3D3833",
"4 c #433D37",
"5 c #C2B0A2",
"6 c #D4D1CA",
"7 c #B0A08E",
"8 c #261F18",
"9 c #D37D1E",
"0 c #D68021",
"a c #B26616",
"b c #27241F",
"c c #9C8E7F",
"d c #EAE9E5",
"e c #A29281",
"f c #2E2012",
"g c #CC751A",
"h c #CC761A",
"i c #BF6C16",
"j c #24211C",
"k c #8E8170",
"l c #EAE8E3",
"m c #E9E8E3",
"n c #E9E7E3",
"o c #8E7F6C",
"p c #221E17",
"q c #C56D14",
"r c #7D450D",
"s c #AF5F11",
"t c #221E19",
"u c #7F7260",
"v c #E9E7E2",
"w c #E8E6E1",
"x c #E7E5E1",
"y c #E7E5E0",
"z c #D5D1CB",
"A c #3E372C",
"B c #1C1F1F",
"C c #301B06",
"D c #542D07",
"E c #291B0E",
"F c #151412",
"G c #473F33",
"H c #E8E6E2",
"I c #546371",
"J c #849CB4",
"K c #56687C",
"L c #343332",
"M c #495868",
"N c #566D85",
"O c #293643",
"P c #E6E4DF",
"Q c #E5E4DE",
"R c #EEEDE9",
"S c #7B95AF",
"T c #7B96B0",
"U c #68819B",
"V c #8999AA",
"W c #5A7088",
"X c #607A96",
"Y c #5B7691",
"Z c #E5E3DE",
"` c #4B4A48",
" . c #757471",
".. c #E6E3DE",
"+. c #3B3A39",
"@. c #747371",
"#. c #D3CFC8",
"$. c #E2E1DD",
"%. c #E7E4E0",
"&. c #D2CFC8",
"*. c #D1D0CA",
"=. c #C2C0B9",
" ",
" ",
" ",
" . . . . . . . . . . . . . . . . . . . . ",
" . + @ # # # # # # # # # # # # # # # # # $ . ",
" . # % . . . . . . . & * = - - - - - - - ; . ",
" . # . > , ' ) ! > , . * * ~ ~ ~ ~ - - ~ { . ",
" . # . ] ^ / . ( _ : . * < [ ~ } } | - ~ 1 . ",
" . # . 2 3 . . . 4 5 . * * ~ ~ - - - - - 6 . ",
" . # . 7 8 9 0 a b c . * [ < | [ - } | d 6 . ",
" . # . e f g h i j k . * * l l m n n n n 6 . ",
" . # . o p q r s t u . v v w w w x y y y z . ",
" . # . A B C D E F G . H H y y y y y y y 6 . ",
" . # . I J K L M N O . y y P P P P P P Q { . ",
" . R . S T U V W X Y . y y P P P P Z Z Z { . ",
" . d ` . . . . . . . ` y y ...+.+.Z @.Z #.. ",
" . $.y y y y y y y y y %.P Z Z Z Z Z Z Z &.. ",
" . *.6 z 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 =.. ",
" . . . . . . . . . . . . . . . . . . . . . ",
" ",
" ",
" ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/copy.xpm
Index: copy.xpm
===================================================================
/* XPM */
static char * stock_mail_copy_xpm[] = {
"24 24 77 1",
" c None",
". c #010101",
"+ c #2F2F2F",
"@ c #E3E2E1",
"# c #FCFCFC",
"$ c #B3B2B1",
"% c #95938E",
"& c #F7F7F7",
"* c #F5F4F2",
"= c #F8F8F8",
"- c #F7F6F6",
"; c #EAE9E5",
"> c #7B7976",
", c #D2CFCA",
"' c #E1E0DD",
") c #908E8B",
"! c #EBEAEA",
"~ c #F1F0EE",
"{ c #E2E0DD",
"] c #7C7B78",
"^ c #C6C3C0",
"/ c #E5E3DE",
"( c #DCDAD7",
"_ c #8F8C88",
": c #EBEBEA",
"< c #EFEDEA",
"[ c #DFDDDA",
"} c #787774",
"| c #C1BEBA",
"1 c #E6E3E0",
"2 c #EFEEEC",
"3 c #CBCAC6",
"4 c #ECECEC",
"5 c #F3F2F0",
"6 c #DCDCDC",
"7 c #7D7C79",
"8 c #B4B2AE",
"9 c #E7E5E1",
"0 c #F0EFEB",
"a c #E4E2DD",
"b c #7B7874",
"c c #AFACA6",
"d c #ABA8A3",
"e c #F9F8F6",
"f c #EAE9E8",
"g c #B0ADA7",
"h c #F5F3F0",
"i c #B9B8B6",
"j c #CBC9C4",
"k c #DEDBD5",
"l c #9D9994",
"m c #DBD9D6",
"n c #747370",
"o c #A09C97",
"p c #DAD8D5",
"q c #E7E6E3",
"r c #E8E6E1",
"s c #E0DED9",
"t c #F7F6F4",
"u c #D3D1CF",
"v c #868480",
"w c #C2BFBD",
"x c #DAD9D5",
"y c #F6F5F1",
"z c #D8D6D1",
"A c #F7F5F2",
"B c #92908B",
"C c #CCCAC5",
"D c #F7F6F2",
"E c #F5F4F0",
"F c #EAE8E3",
"G c #D2D0CB",
"H c #D9D7D2",
"I c #DAD8D3",
"J c #D5D3CE",
"K c #D6D4CF",
"L c #040404",
" ",
" ",
" ",
" .+........... ",
" .@###########$. ",
" .#%&*=*-*-*;>,. ",
" .#')!~-*-*{]^/. ",
" .#~(_:~<~[}|1/. ",
" .#~23]4567890a. ",
" .#22~b.+........... ",
" .#~2c.@###########$. ",
" .#2de.#%&*=*-*-*;>,. ",
" .fgeh.#')!~-*-*{]^/. ",
" .ijkk.#~(_:~<~[}|1/. ",
" .....#~23]4567890a. ",
" .#22~l]mnopqrs. ",
" .#~2ctuvwxoy0z. ",
" .#2deetptAABrC. ",
" .fgehDEAEAhFBG. ",
" .ijkkkHIJKGGGB. ",
" ............L ",
" ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/delete.xpm
Index: delete.xpm
===================================================================
/* XPM */
static char * stock_delete_xpm[] = {
"24 24 243 2",
" c None",
". c #000000",
"+ c #1C1C1C",
"@ c #767676",
"# c #E6E6E6",
"$ c #D3D3D3",
"% c #C3C3C3",
"& c #909090",
"* c #494949",
"= c #48473D",
"- c #BAB8A6",
"; c #E2E2DF",
"> c #F1F1F0",
", c #EAE9E6",
"' c #F2F2EE",
") c #EBEAE5",
"! c #C1C0B5",
"~ c #57564A",
"{ c #525146",
"] c #A8A68F",
"^ c #BDBBA1",
"/ c #C0BEA3",
"( c #A3A18A",
"_ c #6D6C5C",
": c #7C7C72",
"< c #4C4C49",
"[ c #45453F",
"} c #44433A",
"| c #6F6F67",
"1 c #C6C5B9",
"2 c #B6B59B",
"3 c #6D6C5D",
"4 c #B3B19B",
"5 c #A7A68E",
"6 c #908F7A",
"7 c #AAA993",
"8 c #CCCBB5",
"9 c #D0CEBA",
"0 c #D5D3C1",
"a c #AEADA3",
"b c #94938A",
"c c #454442",
"d c #232321",
"e c #353431",
"f c #292823",
"g c #1E1E1A",
"h c #535246",
"i c #ADAC93",
"j c #929189",
"k c #C2C1AF",
"l c #B1AF96",
"m c #ACAA92",
"n c #93927D",
"o c #080808",
"p c #D1D0C1",
"q c #D6D5C4",
"r c #DFDED1",
"s c #CECDC0",
"t c #ACACA6",
"u c #908F8A",
"v c #7E7D77",
"w c #5C5C55",
"x c #47463E",
"y c #656456",
"z c #777665",
"A c #807E6F",
"B c #BEBDA7",
"C c #B5B39A",
"D c #A19F88",
"E c #D9D8CC",
"F c #F6F5F2",
"G c #DBDAD1",
"H c #DAD9CE",
"I c #E5E4D9",
"J c #D0CFC3",
"K c #D3D3C9",
"L c #CAC9BC",
"M c #B7B6A6",
"N c #B8B6A1",
"O c #B0AF96",
"P c #B9B89D",
"Q c #B9B79D",
"R c #B8B69C",
"S c #C4C2A9",
"T c #AFAD97",
"U c #8B8976",
"V c #AAA998",
"W c #B6B6B2",
"X c #F9F9F7",
"Y c #FAFAF8",
"Z c #F4F4F0",
"` c #E2E1DA",
" . c #D9D9CE",
".. c #DBDACF",
"+. c #D3D1BE",
"@. c #C5C4AC",
"#. c #D6D5C3",
"$. c #CDCCBF",
"%. c #BBBAAD",
"&. c #7C7A69",
"*. c #717060",
"=. c #131313",
"-. c #999882",
";. c #AFAE9D",
">. c #C3C3BE",
",. c #DEDEDC",
"'. c #E9E9E8",
"). c #FBFBFA",
"!. c #FDFDFC",
"~. c #FDFDFD",
"{. c #FCFBFA",
"]. c #F2F2EF",
"^. c #EAE9E3",
"/. c #C0BFB1",
"(. c #959484",
"_. c #787766",
":. c #6E6D5D",
"<. c #5B5B4D",
"[. c #5D5C4F",
"}. c #A3A293",
"|. c #B8B7A6",
"1. c #D8D7D0",
"2. c #DBDBD4",
"3. c #D3D2CA",
"4. c #C8C8C3",
"5. c #C6C5BD",
"6. c #BDBCAD",
"7. c #BAB8A8",
"8. c #9F9E8B",
"9. c #8E8C78",
"0. c #8C8B77",
"a. c #7A7968",
"b. c #6C6B5D",
"c. c #4E4D45",
"d. c #424242",
"e. c #7B7B73",
"f. c #9F9F96",
"g. c #D2D1C7",
"h. c #DCDBD2",
"i. c #CCCBBE",
"j. c #D1D0C2",
"k. c #C4C3B6",
"l. c #9A9883",
"m. c #807F6D",
"n. c #7D7C6B",
"o. c #6A695E",
"p. c #40403E",
"q. c #37372D",
"r. c #0F0F0F",
"s. c #383734",
"t. c #787875",
"u. c #999893",
"v. c #8A897E",
"w. c #B3B2A4",
"x. c #AAAA9E",
"y. c #878673",
"z. c #8F8D79",
"A. c #626155",
"B. c #545451",
"C. c #31312E",
"D. c #2B2B23",
"E. c #71715D",
"F. c #57574B",
"G. c #42423A",
"H. c #262620",
"I. c #212121",
"J. c #1B1B1B",
"K. c #242424",
"L. c #161613",
"M. c #2A2A22",
"N. c #303027",
"O. c #3F3F34",
"P. c #7A7A65",
"Q. c #5B5B51",
"R. c #858576",
"S. c #76766B",
"T. c #98988E",
"U. c #75756B",
"V. c #515146",
"W. c #7F7F74",
"X. c #6A6A58",
"Y. c #404035",
"Z. c #626251",
"`. c #545445",
" + c #3E3E33",
".+ c #555546",
"++ c #34342B",
"@+ c #515143",
"#+ c #85856E",
"$+ c #5D5D54",
"%+ c #919182",
"&+ c #828278",
"*+ c #AAAAA3",
"=+ c #7A7A71",
"-+ c #4E4E45",
";+ c #8A8A80",
">+ c #7C7C6D",
",+ c #424237",
"'+ c #606052",
")+ c #5A5A4A",
"!+ c #3C3C32",
"~+ c #4E4E41",
"{+ c #35352C",
"]+ c #ACAC9C",
"^+ c #85857B",
"/+ c #BBBBB3",
"(+ c #A3A39A",
"_+ c #54544B",
":+ c #93938A",
"<+ c #919185",
"[+ c #686856",
"}+ c #414136",
"|+ c #434337",
"1+ c #A4A493",
"2+ c #C1C1B6",
"3+ c #B1B1A2",
"4+ c #6B6B5F",
"5+ c #9D9D8B",
"6+ c #848470",
"7+ c #71715E",
"8+ c #A5A594",
"9+ c #C2C2B7",
"0+ c #7B7B65",
"a+ c #5F5F4F",
"b+ c #666654",
"c+ c #49493C",
"d+ c #575748",
"e+ c #57574A",
"f+ c #7D7D6D",
"g+ c #767669",
"h+ c #B3B3A8",
"i+ c #A1A194",
"j+ c #6D6D61",
"k+ c #B3B3A5",
"l+ c #696957",
"m+ c #414135",
"n+ c #565647",
"o+ c #444438",
"p+ c #595951",
"q+ c #585849",
"r+ c #4E4E40",
"s+ c #747467",
"t+ c #616153",
" . . . . . . ",
" . + @ # $ % & * . . ",
" . . . = - ; > , ' ) ! ~ { . . . ",
" . ] ^ / ( _ : < [ } | 1 2 3 4 5 6 . ",
" . 7 8 9 0 a b c d e f g h i j k l m n . ",
" o p 8 q r s t u v w x y z A B C 2 C D . ",
" . E F G H I J K L M N O D P Q R S T U . ",
" . V W X Y Z ` ...0 +.S / @.#.$.%.&.*.. ",
" =.-.;.>.,.'.).!.~.{.X ].^.G /.(._.:.<.. ",
" . [.n }.|.1.2.3.4.5.6.7.8.9.0.9.a.b.c. ",
" . d.e.f.g.h.i.j.k.l l l l.m.n.o.p.. ",
" . q.r.s.t.u.v.w.x.( y.z.A.B.C.. D.. ",
" . E.F.G.H.I.J.. K.. . . . L.M.N.O.. ",
" . P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+. ",
" . #+$+%+&+*+=+-+;+>+,+'+)+!+~+{+`.. ",
" . #+Q.]+^+/+(+_+:+<+,+'+[+}+X.|+X.. ",
" . #+Q.1+^+2+3+4+3+5+`.6+7+|+X.|+X.. ",
" . #+Q.8+^+9+3+4+3+5+`.6+7+|+X.|+X.. ",
" . #+Q.5+^+2+3+4+3+5+`.6+7+|+X.|+X.. ",
" . 0+Q.1+^+2+3+4+3+5+`.6+7+|+X.|+a+. ",
" . b+Q.1+&+2+3+4+3+5+`.6+7+|+X.c+d+. ",
" . e+f+g+h+i+j+k+5+`.6+l+m+n+o+. . ",
" . . . p+q+r+s+t+~+c+c+. . . ",
" . . . . . . . . . . "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/describe.xpm
Index: describe.xpm
===================================================================
/* XPM */
static char * stock_properties_xpm[] = {
"24 24 68 1",
" c None",
". c #000000",
"+ c #74716E",
"@ c #C9C4BD",
"# c #DFDAD2",
"$ c #F4EFE5",
"% c #F2ECE1",
"& c #FFFFFF",
"* c #4C4B48",
"= c #EEE5D4",
"- c #ECE2CF",
"; c #EADFC9",
"> c #F9F9F9",
", c #E2D2B1",
"' c #F4F4F4",
") c #EEEEEE",
"! c #959595",
"~ c #F5F5F5",
"{ c #F6F6F6",
"] c #D9D9D9",
"^ c #C7B99C",
"/ c #E9E9E9",
"( c #787878",
"_ c #E1E1E1",
": c #E2E2E2",
"< c #C8C8C8",
"[ c #877E69",
"} c #9A8F78",
"| c #DEDEDE",
"1 c #E3E3E3",
"2 c #929292",
"3 c #AFA389",
"4 c #ACACAC",
"5 c #A2A2A2",
"6 c #E4E4E4",
"7 c #BCBCBC",
"8 c #939393",
"9 c #EDEDED",
"0 c #EFEFEF",
"a c #F0F0F0",
"b c #E5E5E5",
"c c #E7E7E7",
"d c #E8E8E8",
"e c #EAEAEA",
"f c #EBEBEB",
"g c #BEBEBE",
"h c #F1F1F1",
"i c #DFDFDF",
"j c #F3F3F3",
"k c #E0E0E0",
"l c #ABABAB",
"m c #AEAEAE",
"n c #AFAFAF",
"o c #ADADAD",
"p c #B0B0B0",
"q c #B1B1B1",
"r c #F7F7F7",
"s c #B3B3B3",
"t c #F8F8F8",
"u c #B4B4B4",
"v c #B5B5B5",
"w c #B6B6B6",
"x c #FAFAFA",
"y c #FBFBFB",
"z c #DCDCDC",
"A c #DDDDDD",
"B c #E6E6E6",
"C c #969696",
" ",
" ",
" ",
" ......... ",
" .+(a)#$%.&&. ",
" *=---;.&>. ",
" .......;.,,,,.'). ",
" !~~{].;.^.,^^./(.. ",
" .~_:<.;.[.^.}..|].. ",
" .~:1.;.2.[.3.4...5. ",
" .{16..7/8.[.49)0a|. ",
" .{6bcd/ef8.g9)0ahi. ",
" .{bcd/ef9ef9)0ahjk. ",
" .{cllefmnomnppqj'_. ",
" .rd/ef9)09)0ahj'~:. ",
" .r/4o9)ppnppqss~{1. ",
" .tef9)0ah0ahj'~{rb. ",
" .>9npahssqssuvw>xc. ",
" .>)0ahj'~j'~{r>xyd. ",
" .nzA|ik_:k_:1bBcdC. ",
" ................. ",
" ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/disconnect.xpm
Index: disconnect.xpm
===================================================================
/* XPM */
static char * stock_disconnect_xpm[] = {
"24 24 42 1",
" c None",
". c #000000",
"+ c #989389",
"@ c #807D74",
"# c #C6C2BA",
"$ c #43423C",
"% c #B7B3AA",
"& c #C4C2BD",
"* c #EAE8E3",
"= c #E2E1DD",
"- c #F0EFEC",
"; c #AAA7A0",
"> c #C5D2C8",
", c #E9EEEA",
"' c #F0EEEB",
") c #F2F0ED",
"! c #EBEAE6",
"~ c #8A857B",
"{ c #ECEBE8",
"] c #EEECEA",
"^ c #78756B",
"/ c #BEBBB5",
"( c #B3B1AA",
"_ c #7D786E",
": c #E1DFDB",
"< c #D1D0CC",
"[ c #010101",
"} c #8C8981",
"| c #A6A29B",
"1 c #726D63",
"2 c #CECAC3",
"3 c #A7A49E",
"4 c #0F0F0D",
"5 c #F0F3F1",
"6 c #272622",
"7 c #8B877E",
"8 c #706C62",
"9 c #B1ADA4",
"0 c #6C685E",
"a c #97938A",
"b c #646056",
"c c #8B877D",
" ",
" ",
" ",
" ",
" ",
" ",
" .. ..",
" ..+@. .#@",
" $%&*@.... .*@",
" .=-;*@.>>,. .'@",
".....@=-;*@.... .'@",
"******)!~{@. .]@",
"@@@@^^/(_:^. .<@",
"....[^}|12^.... .3@",
" 4}|12^.>>5. .3@",
" 67890.... .a@",
" 44+b. .c@",
" 44 4.",
" ",
" ",
" ",
" ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/exit.xpm
Index: exit.xpm
===================================================================
/* XPM */
static char * stock_exit_xpm[] = {
"24 24 140 2",
" c None",
". c #000000",
"+ c #D6D6D4",
"@ c #BDBDBC",
"# c #A8A8A4",
"$ c #92928F",
"% c #727370",
"& c #61615E",
"* c #20201F",
"= c #F1F1EF",
"- c #E6E6E4",
"; c #DADAD7",
"> c #CFCFCD",
", c #C4C4C1",
"' c #A8A8A5",
") c #767674",
"! c #777774",
"~ c #1E1E1D",
"{ c #B9B9B7",
"] c #AEAEAC",
"^ c #8F8F8D",
"/ c #262626",
"( c #414140",
"_ c #E9836C",
": c #DEDEDC",
"< c #C5C5C2",
"[ c #636362",
"} c #040504",
"| c #040604",
"1 c #050705",
"2 c #E87B62",
"3 c #E67056",
"4 c #D5D5D3",
"5 c #DBDBD8",
"6 c #D0D0CE",
"7 c #080A07",
"8 c #0A0C09",
"9 c #0A0D09",
"0 c #0B0E0A",
"a c #F0B0A1",
"b c #EB8D77",
"c c #DF421E",
"d c #E97E66",
"e c #CBCBC8",
"f c #0C0F0B",
"g c #0F130D",
"h c #10140E",
"i c #11150F",
"j c #EFA392",
"k c #BFBFBD",
"l c #5D5D5C",
"m c #10150F",
"n c #141912",
"o c #161C14",
"p c #171D15",
"q c #B7B7B4",
"r c #0C0C0C",
"s c #192017",
"t c #1C2319",
"u c #1D241A",
"v c #CD8484",
"w c #990000",
"x c #701616",
"y c #A6A6A5",
"z c #181E16",
"A c #1E261B",
"B c #212A1E",
"C c #222B1F",
"D c #4F0000",
"E c #AEAEAB",
"F c #1D261B",
"G c #242E21",
"H c #273224",
"I c #283325",
"J c #580000",
"K c #B5B5B3",
"L c #293426",
"M c #2D3929",
"N c #2E3A2A",
"O c #7C4343",
"P c #6A0000",
"Q c #720000",
"R c #BDBDBB",
"S c #232C20",
"T c #2A3526",
"U c #303C2B",
"V c #33402E",
"W c #C5C5C3",
"X c #1E261C",
"Y c #303D2C",
"Z c #374532",
"` c #394834",
" . c #500000",
".. c #CDCDCB",
"+. c #1B2319",
"@. c #253022",
"#. c #303E2D",
"$. c #394934",
"%. c #3D4E38",
"&. c #9D9D9B",
"*. c #565655",
"=. c #2C3828",
"-. c #40503A",
";. c #43553E",
">. c #BABAB7",
",. c #777776",
"'. c #323830",
"). c #232C1F",
"!. c #313E2D",
"~. c #3B4A36",
"{. c #43553D",
"]. c #485B42",
"^. c #4A5E44",
"/. c #F0F0EE",
"(. c #E5E5E3",
"_. c #C6C6C3",
":. c #ACACAB",
"<. c #8B8B8A",
"[. c #32392F",
"}. c #2C3728",
"|. c #3F503A",
"1. c #465840",
"2. c #4B5E44",
"3. c #4E6347",
"4. c #506549",
"5. c #DADAD8",
"6. c #7A7D78",
"7. c #333C30",
"8. c #475A41",
"9. c #4F6348",
"0. c #53694C",
"a. c #566C4E",
"b. c #576D4F",
"c. c #91968F",
"d. c #3B4736",
"e. c #42543C",
"f. c #51674A",
"g. c #586F50",
"h. c #5B7353",
"i. c #5C7454",
" ",
" . . . . . . . . . . . . . . . . ",
" . + @ # $ % & & & * . . . . . . ",
" . = - ; > , ' ) ! ~ . . . . . . ",
" . . = - ; > , { ] ^ / . . . . . . ",
" . . . = - ; > , { { { ( . . . . . . ",
" . _ . : - ; > < { { { [ } | 1 1 1 . ",
". . . . . . 2 3 . 4 5 6 < { { { [ 7 8 9 0 0 . ",
". a 2 2 2 2 b c d . e 6 < { { { [ f g h i i . ",
". j c c c c c c c 3 . k < { l { [ m n o p p . ",
". j c c c c c c c c 3 . q { l r [ n s t u u . ",
". v w w w w w w w w w x . y r { [ z A B C C . ",
". v w w w w w w w w D . E { { { [ F G H I I . ",
". v w w w w w w w J . K < { { { [ C L M N N . ",
". O P P P P Q w J . R 6 < { { { [ S T U V V . ",
". . . . . . Q J . W 5 6 < { { { [ X H Y Z ` . ",
" . .. ..- 5 6 < { { { [ +.@.#.$.%.. ",
" . . . = - 5 6 < { ] &.*.B =.Z -.;.. ",
" . . = - 5 6 >.&.,.'.).!.~.{.].^.. ",
" . /.(._.:.<.[.}.Z |.1.2.3.4.4.. ",
" . 5.k 6.7.Z -.8.9.0.a.a.b.b.b.. ",
" . c.d.e.^.f.g.h.i.i.i.i.i.i.i.. ",
" . . . . . . . . . . . . . . . . ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/forward.xpm
Index: forward.xpm
===================================================================
/* XPM */
static char * stock_mail_forward_xpm[] = {
"24 24 65 1",
" c None",
". c #000000",
"+ c #535353",
"@ c #FFFFFF",
"# c #FEFEFE",
"$ c #FDFDFD",
"% c #FCFCFC",
"& c #FBFBFB",
"* c #F9F9F9",
"= c #F8F8F8",
"- c #F7F7F7",
"; c #F6F6F6",
"> c #F5F5F5",
", c #F4F4F4",
"' c #E3E3E3",
") c #EEEEEE",
"! c #4F4F4F",
"~ c #F3F3F3",
"{ c #F2F2F2",
"] c #F1F1F1",
"^ c #F0F0F0",
"/ c #EFEFEF",
"( c #EDEDED",
"_ c #AEAEAE",
": c #E4E4E4",
"< c #434343",
"[ c #ACACAC",
"} c #C8C8C8",
"| c #A0A0A0",
"1 c #D4D4D4",
"2 c #ECECEC",
"3 c #959595",
"4 c #3E3E3E",
"5 c #4D4D4D",
"6 c #818181",
"7 c #C6C6C6",
"8 c #6A6A6A",
"9 c #636363",
"0 c #B9B9B9",
"a c #737373",
"b c #7C7C7C",
"c c #5B88B2",
"d c #9EB8D1",
"e c #5080AD",
"f c #B5C9DC",
"g c #AFC5DA",
"h c #B2C7DB",
"i c #B6CADD",
"j c #A4BDD5",
"k c #9CB7D1",
"l c #080D11",
"m c #BCBCBC",
"n c #9BB6D0",
"o c #A0BAD3",
"p c #9AB5CF",
"q c #97B3CE",
"r c #5F8BB4",
"s c #91B0CC",
"t c #95B2CE",
"u c #4C79A3",
"v c #49749C",
"w c #3F6588",
"x c #2A435B",
"y c #456F96",
"z c #375978",
" ",
" ",
" ",
" ................. ",
" .+@@@@#$%&*=-;>,'+. ",
" .)!@>,~{{]^^/)('!_. ",
" .@:<$~{{]^/))('![}. ",
" .@>:!&]^^/)(('<|1}. ",
" .@&>:<=^/)(2'!31:}. ",
" .@>>>:4>)(2'567::}. ",
" .@&>>:8<~2'!877>.}. ",
" .@>>:9@0!^!37a7>... ",
" .@&:9@>:1![7::b:.c. ",
" .@:a@>>>>:.......de. ",
" .@b@::::::.fghiiijkel ",
" .ammmmmmmm.nokknpokqr. ",
" ..........sdppnkkkotu.",
" .vwwwwwwwwx. ",
" .yzzzzzwwx. ",
" .......wx. ",
" .x. ",
" .. ",
" . ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/inbox.xpm
Index: inbox.xpm
===================================================================
/* XPM */
static char * stock_inbox_xpm[] = {
"24 24 76 1",
" c None",
". c #000000",
"+ c #B5CADD",
"@ c #BFD1E1",
"# c #C3D4E3",
"$ c #C7D7E5",
"% c #B0C6DA",
"& c #6B94BB",
"* c #131E29",
"= c #739ABF",
"- c #7EA2C4",
"; c #9AB6D0",
"> c #E4EBF2",
", c #DDE6EF",
"' c #8CACCA",
") c #5C8AB4",
"! c #090F15",
"~ c #B1C7DB",
"{ c #D0DDEA",
"] c #D9E3ED",
"^ c #88A9C8",
"/ c #4D7CA7",
"( c #030405",
"_ c #41688D",
": c #32506C",
"< c #C4D5E4",
"[ c #A5BED5",
"} c #456F97",
"| c #3B5F81",
"1 c #C8D8E6",
"2 c #9CB8D2",
"3 c #395B7B",
"4 c #C6D6E4",
"5 c #BBCEDF",
"6 c #3D6183",
"7 c #B6CBDE",
"8 c #426A90",
"9 c #E2C6A9",
"0 c #E5CDB4",
"a c #D5AA7F",
"b c #9D6733",
"c c #CB9967",
"d c #ADC4D9",
"e c #B99877",
"f c #CFBAA4",
"g c #9A7149",
"h c #CDA378",
"i c #D2A87E",
"j c #608DB6",
"k c #AA7B4B",
"l c #C2A588",
"m c #996633",
"n c #BB9978",
"o c #C3976B",
"p c #D2A980",
"q c #D1A77D",
"r c #E0C4A8",
"s c #C9B097",
"t c #D7B38E",
"u c #DAC2A9",
"v c #BD9063",
"w c #CEA57C",
"x c #E5CFBB",
"y c #393633",
"z c #E0C8B1",
"A c #C9A480",
"B c #D1A87E",
"C c #D0A67B",
"D c #E1CAB4",
"E c #52504D",
"F c #D8C6B5",
"G c #CBA988",
"H c #CCAF93",
"I c #D2B496",
"J c #A67D51",
"K c #E2CFBD",
" ...... ",
" .+@#$%&*. ",
" .=-;$>,')! ",
" ...=~{]^/( ",
" .=+#$_:. ",
" .<[@}|. ",
" .12@}3. ",
" ....425}6.... ",
" .=2527}8}:. ",
" ..9.=227}}:. ",
" ..0abb.=2~}:.. ",
" ..0abbbbc.=d:.ef.. ",
".0abbbbghii.j.kkklf.. ",
".mnabgopqqqi.iokkkkef. ",
".mmmnrooqiqqqiiiokkkks. ",
".mmmmmnrooqiqqqiiiokkl. ",
" ..mmmmmnrooqiqqiiituf. ",
" ..mmmmmnrvwiqqtxxy. ",
" ..mmmmmzABCDxE.. ",
" ...mmmFGHIE.. ",
" ...mJK... ",
" ..... ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/lock-broken.xpm
Index: lock-broken.xpm
===================================================================
/* XPM */
static char * stock_lock_broken_xpm[] = {
"24 24 204 2",
" c None",
". c #0E0E0E",
"+ c #262626",
"@ c #464646",
"# c #3C3C3C",
"$ c #3B3B3B",
"% c #212121",
"& c #252525",
"* c #ADADAD",
"= c #F0F0F0",
"- c #EAEAEA",
"; c #1A1A1A",
"> c #000000",
", c #FAFAFA",
"' c #F4F4F4",
") c #4D4D4D",
"! c #303030",
"~ c #D8D8D8",
"{ c #E5E5E5",
"] c #B0B0B0",
"^ c #414141",
"/ c #484848",
"( c #030303",
"_ c #DADADA",
": c #E4E4E4",
"< c #353535",
"[ c #070707",
"} c #A6A6A6",
"| c #E6E6E6",
"1 c #686868",
"2 c #020202",
"3 c #3E3E3E",
"4 c #EFEFEF",
"5 c #9B9B9B",
"6 c #343434",
"7 c #F8F8F8",
"8 c #999999",
"9 c #F1F1F1",
"0 c #C4C4C4",
"a c #232323",
"b c #535353",
"c c #AEAEAE",
"d c #F3F3F3",
"e c #D3D3D3",
"f c #242424",
"g c #4E4E4E",
"h c #EEEEEE",
"i c #B5B5B5",
"j c #0F0601",
"k c #200E03",
"l c #765E49",
"m c #7D6A56",
"n c #38291D",
"o c #180A03",
"p c #D6CBC1",
"q c #A09E9D",
"r c #1D1109",
"s c #2A1E13",
"t c #3D2E21",
"u c #3F3123",
"v c #47423D",
"w c #DBB98E",
"x c #D6B183",
"y c #D3AC7E",
"z c #CFA573",
"A c #CD9E67",
"B c #C39056",
"C c #46270A",
"D c #281F14",
"E c #675643",
"F c #A48367",
"G c #D8AB7C",
"H c #BF9E7C",
"I c #DCBB93",
"J c #DCB786",
"K c #D1A872",
"L c #231B12",
"M c #7B6C58",
"N c #C69B63",
"O c #C39860",
"P c #C09257",
"Q c #BD8A4A",
"R c #B9803D",
"S c #AA6E28",
"T c #412409",
"U c #100B07",
"V c #CDB598",
"W c #E8CCA9",
"X c #DAB587",
"Y c #D4AC7D",
"Z c #D1A775",
"` c #C99F6A",
" . c #AF8B5B",
".. c #2E2517",
"+. c #1E1910",
"@. c #0B0805",
"#. c #594B39",
"$. c #2A2015",
"%. c #C2975E",
"&. c #BE8D50",
"*. c #BB823F",
"=. c #AE722C",
"-. c #422409",
";. c #0E0B07",
">. c #AB957E",
",. c #E9CEAC",
"'. c #DBB68A",
"). c #D5AD7E",
"!. c #D0A975",
"~. c #C9A26F",
"{. c #B99667",
"]. c #AA895F",
"^. c #31291C",
"/. c #322A1C",
"(. c #54493B",
"_. c #C69C64",
":. c #C2965E",
"<. c #BE8E50",
"[. c #C29156",
"}. c #9E692A",
"|. c #1A150D",
"1. c #887762",
"2. c #EAD1AF",
"3. c #DDB98E",
"4. c #D4AC7E",
"5. c #D2A876",
"6. c #C39E6D",
"7. c #927751",
"8. c #15110C",
"9. c #988468",
"0. c #C2945A",
"a. c #BE8F51",
"b. c #BC8544",
"c. c #BE8A4F",
"d. c #9A6526",
"e. c #70604D",
"f. c #EFD6B5",
"g. c #DEBD93",
"h. c #D4AC7C",
"i. c #D0A672",
"j. c #C9A069",
"k. c #9D7E53",
"l. c #140F09",
"m. c #1F1710",
"n. c #EFD8B9",
"o. c #E3C39C",
"p. c #D7B080",
"q. c #D4AC79",
"r. c #CDA46F",
"s. c #3A2C1B",
"t. c #FFFFFF",
"u. c #1C160D",
"v. c #B29E85",
"w. c #E6C8A3",
"x. c #D7B081",
"y. c #D1A874",
"z. c #CBA16A",
"A. c #BA905A",
"B. c #251C10",
"C. c #DF421E",
"D. c #F7F7F7",
"E. c #DFDFDF",
"F. c #2F2619",
"G. c #92806A",
"H. c #E6C7A2",
"I. c #D6AF7E",
"J. c #CCA26C",
"K. c #53422A",
"L. c #211910",
"M. c #2A2014",
"N. c #E1E1E1",
"O. c #6A5C4A",
"P. c #EAD0AD",
"Q. c #DAB68B",
"R. c #D2A978",
"S. c #CEA56E",
"T. c #C89D66",
"U. c #856740",
"V. c #534026",
"W. c #F9F9F9",
"X. c #FBFBFB",
"Y. c #E2E2E2",
"Z. c #42362B",
"`. c #D1BA9B",
" + c #DCBA8E",
".+ c #D1A773",
"++ c #C4975C",
"@+ c #BE8C4C",
"#+ c #B4813F",
"$+ c #281B0B",
"%+ c #E3E3E3",
"&+ c #372416",
"*+ c #74654F",
"=+ c #B68E5C",
"-+ c #926231",
";+ c #452B11",
">+ c #341E09",
",+ c #221205",
"'+ c #150802",
")+ c #FDFDFD",
"!+ c #030000",
"~+ c #050000",
"{+ c #010000",
"]+ c #C3C3C3",
" ",
" ",
" . + @ # $ % ",
" & * = - ; > , ' ) > ",
" ! ~ { ] ^ / ( $ _ : < ",
" [ } | 1 2 3 4 5 > ",
" 6 7 8 > > 9 0 a ",
" b 9 c > > d e f ",
" g h i > j k l m n o ",
" ^ p q r s t u > v w x y z A B C ",
" D E F G H I J K L > M N O P Q R S T ",
" U V W X Y Z ` ...+. @.#.$.%.&.*.=.-. ",
" ;.>.,.'.).!.~.{.].^./. (._.:.<.[.}.-. ",
" |.1.2.3.4.5.6.7.8. > 9.0.a.b.c.d.T ",
" e.f.g.h.i.j.k.l.> > > > > > > > > >
",
" m.n.o.p.q.r._.s. > t.t.t.t.t.t.t.> ",
" u.v.w.x.y.z.A.B.> > t.C.C.D.C.C.E.> ",
" F.G.H.I.i.J.K.L.M. > t.C.C.C.C.C.N.> ",
" O.P.Q.R.S.T.U.V. > t.W.C.C.C.X.Y.> ",
" Z.`. +.+z.++@+#+$+> > t.C.C.C.C.C.%+> ",
" &+*+=+-+;+>+,+'+ > t.C.C.)+C.C.{ > ",
" !+~+{+> > - %+%+: { { ]+> ",
" > > > > > > > > > ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/lock-ok.xpm
Index: lock-ok.xpm
===================================================================
/* XPM */
static char * stock_lock_ok_xpm[] = {
"24 24 188 2",
" c None",
". c #000000",
"+ c #212121",
"@ c #9E9E9E",
"# c #E6E6E6",
"$ c #E7E7E7",
"% c #C8C8C8",
"& c #A0A0A0",
"* c #131313",
"= c #5F5F5F",
"- c #EDEDED",
"; c #D6D6D6",
"> c #D5D5D5",
", c #DDDDDD",
"' c #D8D8D8",
") c #A1A1A1",
"! c #3C3C3C",
"~ c #353535",
"{ c #EFEFEF",
"] c #CFCFCF",
"^ c #4C4C4C",
"/ c #141414",
"( c #6A6A6A",
"_ c #D0D0D0",
": c #B2B2B2",
"< c #454545",
"[ c #E2E2E2",
"} c #292929",
"| c #0F0F0F",
"1 c #949494",
"2 c #E9E9E9",
"3 c #C3C3C3",
"4 c #1C1C1C",
"5 c #E1E1E1",
"6 c #272727",
"7 c #DEDEDE",
"8 c #B6B6B6",
"9 c #B7B6B6",
"0 c #150902",
"a c #2E2419",
"b c #251D15",
"c c #616160",
"d c #5E5A56",
"e c #29211A",
"f c #15100C",
"g c #2F251B",
"h c #1D1710",
"i c #4A392B",
"j c #656361",
"k c #565352",
"l c #392B1D",
"m c #322110",
"n c #0C0500",
"o c #EFDBBF",
"p c #EDD9C0",
"q c #E9D5BE",
"r c #E7D2B9",
"s c #E5D0B3",
"t c #DCC09D",
"u c #D9BE99",
"v c #DABE99",
"w c #D7BB95",
"x c #D5B68E",
"y c #D2AF85",
"z c #CFA77C",
"A c #9A5E1B",
"B c #F0DABF",
"C c #E4C6A0",
"D c #D6AF80",
"E c #D3AC7B",
"F c #D0A570",
"G c #C99F68",
"H c #C69B64",
"I c #C69C64",
"J c #C89D66",
"K c #C79C65",
"L c #C39860",
"M c #C09256",
"N c #BC8645",
"O c #B67C36",
"P c #985E1A",
"Q c #EED8BC",
"R c #E3C39C",
"S c #D3AA7B",
"T c #CFA670",
"U c #CA9F68",
"V c #C89E66",
"W c #C89F68",
"X c #C49961",
"Y c #C09358",
"Z c #BC8746",
"` c #B77D39",
" . c #EED8BB",
".. c #E2C29B",
"+. c #D6AE7F",
"@. c #CA9E6D",
"#. c #C69861",
"$. c #BF925A",
"%. c #BB8E56",
"&. c #BD8E56",
"*. c #5C7354",
"=. c #EFDABE",
"-. c #E4C49D",
";. c #D7B080",
">. c #DAB685",
",. c #D4B07C",
"'. c #D0A971",
"). c #CEA46B",
"!. c #CDA46D",
"~. c #FFFFFF",
"{. c #DBE0D9",
"]. c #52684B",
"^. c #4E6346",
"/. c #52674A",
"(. c #EFD8BB",
"_. c #E0C199",
":. c #D3AA7A",
"<. c #C89B67",
"[. c #C3965F",
"}. c #BC8E56",
"|. c #BA8B52",
"1. c #BA8C54",
"2. c #F6F6F6",
"3. c #F7F7F7",
"4. c #F8F8F8",
"5. c #E6E9E5",
"6. c #6B8064",
"7. c #4B5F45",
"8. c #44553D",
"9. c #E3C29C",
"0. c #D9B484",
"a. c #D4AE77",
"b. c #CFA770",
"c. c #CCA46B",
"d. c #CBA36B",
"e. c #B6BEB3",
"f. c #4E6047",
"g. c #788274",
"h. c #CBD2C9",
"i. c #6A8063",
"j. c #384834",
"k. c #EDD6B8",
"l. c #E1BD94",
"m. c #D1A874",
"n. c #BD9058",
"o. c #B7874E",
"p. c #B48349",
"q. c #B5844C",
"r. c #8F9C8A",
"s. c #53684B",
"t. c #475841",
"u. c #657C5E",
"v. c #4A5D44",
"w. c #626E5D",
"x. c #EED8BA",
"y. c #E0C099",
"z. c #D8B37F",
"A. c #D2AD76",
"B. c #CEA66F",
"C. c #CCA46D",
"D. c #FAFAFA",
"E. c #6A7E63",
"F. c #63715E",
"G. c #E3E3E3",
"H. c #EED5B7",
"I. c #DFC096",
"J. c #D2A776",
"K. c #CEA46E",
"L. c #C89D65",
"M. c #C49960",
"N. c #C1955C",
"O. c #C2955C",
"P. c #FBFBFB",
"Q. c #FCFCFC",
"R. c #80937A",
"S. c #6D796A",
"T. c #FEFEFE",
"U. c #E5E5E5",
"V. c #AC8C65",
"W. c #CFA772",
"X. c #C49256",
"Y. c #C08D51",
"Z. c #BA8849",
"`. c #B78342",
" + c #B48240",
".+ c #B68241",
"++ c #EAEAEA",
"@+ c #E4E4E4",
" ",
" ",
" . . . . . ",
" . + @ # $ % & * ",
" . = - # ; > , ' ) ! . ",
" ~ { ] ^ . . / ( _ : < ",
" . [ ' } . | ( % 1 . ",
" * 2 3 . 4 5 @ . ",
" 6 7 8 . . $ 9 . ",
" 0 a b c d e f g b h b i j k l m n ",
" . o p q r s t u u v u w x y z A . ",
" . B C D E F G H I J K L M N O P . ",
" . Q R D S T U I V W V X Y Z ` A . ",
" . ...+.@.#.$.%.&.. . . . . . . . . *. ",
" . =.-.;.>.,.'.).!.. ~.~.~.~.~.~.{.].^./.",
" . (._.:.<.[.}.|.1.. ~.2.3.3.4.5.6.7.8. ",
" . Q 9.+.0.a.b.c.d.. ~.e.f.g.h.i.7.j. ",
" . k.l.m.#.n.o.p.q.. ~.r.s.t.u.v.w.. ",
" . x.y.S z.A.B.c.C.. ~.D.E.s./.F.G.. ",
" . H.I.J.K.L.M.N.O.. ~.P.Q.R.S.T.U.. ",
" . V.W.X.Y.Z.`. +.+. ++G.G.(a)+U.U.3 . ",
" . . . . . . . . . . . . . . . . . ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/lock.xpm
Index: lock.xpm
===================================================================
/* XPM */
static char * stock_lock_xpm[] = {
"24 24 200 2",
" c None",
". c #000000",
"+ c #212121",
"@ c #9E9E9E",
"# c #E6E6E6",
"$ c #E7E7E7",
"% c #C8C8C8",
"& c #A0A0A0",
"* c #131313",
"= c #5F5F5F",
"- c #EDEDED",
"; c #D6D6D6",
"> c #D5D5D5",
", c #DDDDDD",
"' c #D8D8D8",
") c #A1A1A1",
"! c #3C3C3C",
"~ c #353535",
"{ c #EFEFEF",
"] c #CFCFCF",
"^ c #4C4C4C",
"/ c #141414",
"( c #6A6A6A",
"_ c #D0D0D0",
": c #B2B2B2",
"< c #454545",
"[ c #E2E2E2",
"} c #292929",
"| c #0F0F0F",
"1 c #949494",
"2 c #E9E9E9",
"3 c #C3C3C3",
"4 c #1C1C1C",
"5 c #E1E1E1",
"6 c #272727",
"7 c #DEDEDE",
"8 c #B6B6B6",
"9 c #B7B6B6",
"0 c #150902",
"a c #2E2419",
"b c #251D15",
"c c #616160",
"d c #5E5A56",
"e c #29211A",
"f c #15100C",
"g c #2F251B",
"h c #1D1710",
"i c #4A392B",
"j c #656361",
"k c #565352",
"l c #392B1D",
"m c #322110",
"n c #0C0500",
"o c #EFDBBF",
"p c #EDD9C0",
"q c #E9D5BE",
"r c #E7D2B9",
"s c #E5D0B3",
"t c #DCC09D",
"u c #D9BE99",
"v c #DABE99",
"w c #D7BB95",
"x c #D5B68E",
"y c #D2AF85",
"z c #CFA77C",
"A c #9A5E1B",
"B c #F0DABF",
"C c #E4C6A0",
"D c #D6AF80",
"E c #D3AC7B",
"F c #D0A570",
"G c #C99F68",
"H c #C69B64",
"I c #C69C64",
"J c #C89D66",
"K c #C79C65",
"L c #C39860",
"M c #C09256",
"N c #BC8645",
"O c #B67C36",
"P c #985E1A",
"Q c #EED8BC",
"R c #E3C39C",
"S c #D3AA7B",
"T c #CFA670",
"U c #CA9F68",
"V c #C89E66",
"W c #C89F68",
"X c #C49961",
"Y c #C09358",
"Z c #BC8746",
"` c #B77D39",
" . c #EED8BB",
".. c #E2C29B",
"+. c #D6AE7F",
"@. c #CA9E6D",
"#. c #C69861",
"$. c #BF925A",
"%. c #BB8E56",
"&. c #BD8E56",
"*. c #BD9058",
"=. c #BC8F58",
"-. c #B9884E",
";. c #B48145",
">. c #BA8442",
",. c #B47834",
"'. c #975C1A",
"). c #EFDABE",
"!. c #E4C49D",
"~. c #D7B080",
"{. c #DAB685",
"]. c #D4B07C",
"^. c #D0A971",
"/. c #CEA46B",
"(. c #CDA46D",
"_. c #CCA66D",
":. c #CCA46B",
"<. c #CA9F63",
"[. c #C79858",
"}. c #B9813F",
"|. c #B37834",
"1. c #975D1A",
"2. c #EFD8BB",
"3. c #E0C199",
"4. c #D3AA7A",
"5. c #C89B67",
"6. c #C3965F",
"7. c #BC8E56",
"8. c #BA8B52",
"9. c #BA8C54",
"0. c #BB8D55",
"a. c #BA8C55",
"b. c #B6864C",
"c. c #B47F43",
"d. c #BA833F",
"e. c #B37934",
"f. c #9B601E",
"g. c #E3C29C",
"h. c #D9B484",
"i. c #D4AE77",
"j. c #CFA770",
"k. c #CBA36B",
"l. c #CCA46C",
"m. c #CA9D61",
"n. c #C69856",
"o. c #BA813E",
"p. c #B27733",
"q. c #A36B2F",
"r. c #EDD6B8",
"s. c #E1BD94",
"t. c #D1A874",
"u. c #B7874E",
"v. c #B48349",
"w. c #B5844C",
"x. c #B5884D",
"y. c #B48146",
"z. c #B27A3C",
"A. c #B67D3A",
"B. c #B07530",
"C. c #A67137",
"D. c #EED8BA",
"E. c #E0C099",
"F. c #D8B37F",
"G. c #D2AD76",
"H. c #CEA66F",
"I. c #CCA46D",
"J. c #CCA56D",
"K. c #C99D61",
"L. c #C69858",
"M. c #B9803D",
"N. c #B67D38",
"O. c #AB783F",
"P. c #EED5B7",
"Q. c #DFC096",
"R. c #D2A776",
"S. c #CEA46E",
"T. c #C89D65",
"U. c #C49960",
"V. c #C1955C",
"W. c #C2955C",
"X. c #C2965C",
"Y. c #C09155",
"Z. c #BC8A4B",
"`. c #BE8A4C",
" + c #A9773C",
".+ c #AC8C65",
"++ c #CFA772",
"@+ c #C49256",
"#+ c #C08D51",
"$+ c #BA8849",
"%+ c #B78342",
"&+ c #B48240",
"*+ c #B68241",
"=+ c #B88544",
"-+ c #BB8949",
";+ c #BC8748",
">+ c #BA874A",
",+ c #B98548",
"'+ c #B27B3B",
")+ c #6D4215",
" ",
" ",
" . . . . . ",
" . + @ # $ % & * ",
" . = - # ; > , ' ) ! . ",
" ~ { ] ^ . . / ( _ : < ",
" . [ ' } . | ( % 1 . ",
" * 2 3 . 4 5 @ . ",
" 6 7 8 . . $ 9 . ",
" 0 a b c d e f g b h b i j k l m n ",
" . o p q r s t u u v u w x y z A . ",
" . B C D E F G H I J K L M N O P . ",
" . Q R D S T U I V W V X Y Z ` A . ",
" . ...+.@.#.$.%.&.*.=.-.;.>.,.'.. ",
" . ).!.~.{.].^./.(._.:.<.[.}.|.1.. ",
" . 2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.. ",
" . Q g.+.h.i.j.:.k.l.k.m.n.o.p.q.. ",
" . r.s.t.#.*.u.v.w.x.b.y.z.A.B.C.. ",
" . D.E.S F.G.H.:.I.J.l.K.L.M.N.O.. ",
" . P.Q.R.S.T.U.V.W.X.X.Y.Z.>.`. +. ",
" . .+++@+#+$+%+&+*+=+-+;+>+,+'+)+. ",
" . . . . . . . . . . . . . . . ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/move.xpm
Index: move.xpm
===================================================================
/* XPM */
static char * stock_mail_move_xpm[] = {
"24 24 76 1",
" c None",
". c #010101",
"+ c #2F2F2F",
"@ c #E3E2E1",
"# c #FCFCFC",
"$ c #B3B2B1",
"% c #95938E",
"& c #F7F7F7",
"* c #F5F4F2",
"= c #F8F8F8",
"- c #F7F6F6",
"; c #EAE9E5",
"> c #7B7976",
", c #D2CFCA",
"' c #E1E0DD",
") c #908E8B",
"! c #EBEAEA",
"~ c #F1F0EE",
"{ c #E2E0DD",
"] c #7C7B78",
"^ c #C6C3C0",
"/ c #E5E3DE",
"( c #DCDAD7",
"_ c #8F8C88",
": c #EBEBEA",
"< c #EFEDEA",
"[ c #DFDDDA",
"} c #787774",
"| c #C1BEBA",
"1 c #E6E3E0",
"2 c #EFEEEC",
"3 c #CBCAC6",
"4 c #ECECEC",
"5 c #F3F2F0",
"6 c #DCDCDC",
"7 c #7D7C79",
"8 c #B4B2AE",
"9 c #E7E5E1",
"0 c #F0EFEB",
"a c #E4E2DD",
"b c #9D9994",
"c c #DBD9D6",
"d c #747370",
"e c #A09C97",
"f c #DAD8D5",
"g c #E7E6E3",
"h c #E8E6E1",
"i c #E0DED9",
"j c #AFACA6",
"k c #F7F6F4",
"l c #D3D1CF",
"m c #868480",
"n c #C2BFBD",
"o c #DAD9D5",
"p c #F6F5F1",
"q c #D8D6D1",
"r c #ABA8A3",
"s c #F9F8F6",
"t c #F7F5F2",
"u c #92908B",
"v c #CCCAC5",
"w c #EAE9E8",
"x c #B0ADA7",
"y c #F5F3F0",
"z c #F7F6F2",
"A c #F5F4F0",
"B c #EAE8E3",
"C c #D2D0CB",
"D c #B9B8B6",
"E c #CBC9C4",
"F c #DEDBD5",
"G c #D9D7D2",
"H c #DAD8D3",
"I c #D5D3CE",
"J c #D6D4CF",
"K c #040404",
" ",
" ",
" ",
" . . . . . . . ",
" . . ",
" ",
" . . ",
" ",
" . . ",
" .+........... ",
" . .@###########$. ",
" .#%&*=*-*-*;>,. ",
" . .#')!~-*-*{]^/. ",
" .#~(_:~<~[}|1/. ",
" . . .#~23]4567890a. ",
" .#22~b]cdefghi. ",
" .#~2jklmnoep0q. ",
" .#2rsskfkttuhv. ",
" .wxsyzAtAtyBuC. ",
" .DEFFFGHIJCCCu. ",
" ............K ",
" ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/next-page.xpm
Index: next-page.xpm
===================================================================
/* XPM */
static char * stock_next_page_xpm[] = {
"24 24 92 2",
" c None",
". c #000000",
"+ c #5B7289",
"@ c #FFFFFF",
"# c #F2F2F2",
"$ c #E5E5E5",
"% c #D8D8D8",
"& c #CCCCCC",
"* c #B0B0B0",
"= c #8B8B8B",
"- c #6A6A6A",
"; c #494949",
"> c #888888",
", c #C9C9C9",
"' c #E3E3E3",
") c #EEEEEE",
"! c #E6E6E6",
"~ c #DEDEDE",
"{ c #D6D6D6",
"] c #ADADAD",
"^ c #556D85",
"/ c #47617B",
"( c #BFBFBF",
"_ c #B2B2B2",
": c #ACACAC",
"< c #A6A6A6",
"[ c #F6F6F6",
"} c #384F66",
"| c #3A5067",
"1 c #DADADA",
"2 c #3A5168",
"3 c #D3D3D3",
"4 c #3B5269",
"5 c #47617C",
"6 c #3D526A",
"7 c #48627D",
"8 c #B6B6B6",
"9 c #959595",
"0 c #7C7C7C",
"a c #616161",
"b c #464646",
"c c #262626",
"d c #C5C5C5",
"e c #3E546A",
"f c #49637D",
"g c #3F556B",
"h c #4B647E",
"i c #40566C",
"j c #4C647F",
"k c #41576D",
"l c #4C657F",
"m c #42586E",
"n c #4E6780",
"o c #44586F",
"p c #4F6881",
"q c #B5B5B5",
"r c #45596F",
"s c #506982",
"t c #77838F",
"u c #9C9FA1",
"v c #91969C",
"w c #91979C",
"x c #92979C",
"y c #92979D",
"z c #A2A3A4",
"A c #9D9FA2",
"B c #8F9296",
"C c #8F9396",
"D c #8F9397",
"E c #909397",
"F c #868788",
"G c #465B70",
"H c #526A83",
"I c #3E5975",
"J c #3F5A76",
"K c #415B77",
"L c #425C78",
"M c #435E79",
"N c #445F7A",
"O c #46607B",
"P c #68727D",
"Q c #7D8185",
"R c #616A73",
"S c #3B4F63",
"T c #3C5064",
"U c #3C5065",
"V c #3E5166",
"W c #3F5266",
"X c #405367",
"Y c #405468",
"Z c #344353",
"` c #2F4050",
" ",
" ",
" . . . . . . . . . . . . . . . . ",
" . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ . ",
" . / @ # $ % & ( _ : < @ @ [ ) ! ~ { _ } . ",
" . / @ # $ % & ( _ : < @ ' [ ) ! ~ { _ | . ",
" . / @ # $ % & ( _ : < @ . 1 ) ! ~ { * 2 . ",
" . / @ # $ % & ( _ : < @ . . 3 ! ~ { * 4 . ",
" . 5 @ # $ % & ( _ : < @ . . . & ~ { * 6 . ",
" . 7 @ # $ 8 9 0 a b c . . . . . d { * e . ",
" . f @ # $ % & ( _ : < @ . . . & ~ { * g . ",
" . h @ # $ % & ( _ : < @ . . 3 ! ~ { * i . ",
" . j @ # $ % & ( _ : < @ . 1 ) ! ~ { * k . ",
" . l @ # $ % & ( _ : < @ ' [ ) ! ~ { * m . ",
" . n @ # $ % & ( _ : < @ @ [ ) ! ~ { * o . ",
" . p @ # $ % & ( _ : < @ @ [ ) ! ~ { q r . ",
" . s t u v w x y y z < A B C C D D E F G . ",
" . H I J K L M N O P Q R S T U V W X Y Z . ",
" . . . . . . . . . ` . . . . . . . . . . ",
" . . . ",
" ",
" ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/not-spam.xpm
Index: not-spam.xpm
===================================================================
/* XPM */
static char * stock_not_spam_xpm[] = {
"24 24 122 2",
" c None",
". c #1D1E1E",
"+ c #333839",
"@ c #393F40",
"# c #171819",
"$ c #B2B8B9",
"% c #D5E3E7",
"& c #AABABD",
"* c #64696A",
"= c #0C0D0D",
"- c #929C9E",
"; c #E7F0F3",
"> c #EDF0F1",
", c #E5EDEF",
"' c #C5D9DD",
") c #2E3132",
"! c #3F4343",
"~ c #1F2121",
"{ c #DFEBEE",
"] c #B7C4C8",
"^ c #D2D9DA",
"/ c #E1EFF2",
"( c #B6CBCF",
"_ c #3C4547",
": c #1E2223",
"< c #191E1F",
"[ c #2D2E2F",
"} c #191A1A",
"| c #252829",
"1 c #7E8E92",
"2 c #B7C2C3",
"3 c #C3D9DD",
"4 c #9CACB0",
"5 c #C3CDCE",
"6 c #C7E1E7",
"7 c #668F97",
"8 c #90ACB2",
"9 c #CDDDE1",
"0 c #485559",
"a c #88A6AC",
"b c #1F2223",
"c c #3F4545",
"d c #242728",
"e c #313B3E",
"f c #A8C2C8",
"g c #B2BDC0",
"h c #CFE5E9",
"i c #C2D9DE",
"j c #81989C",
"k c #A2C0C5",
"l c #85A9B1",
"m c #E5ECEE",
"n c #E7F2F4",
"o c #9BAEB3",
"p c #C8E1E7",
"q c #3A3E3F",
"r c #0C0E0E",
"s c #000000",
"t c #333737",
"u c #B3C2C5",
"v c #DDEDF0",
"w c #D8E4E6",
"x c #DAECEF",
"y c #D5E9ED",
"z c #D2E7EC",
"A c #95ADB2",
"B c #DBE2E2",
"C c #EDEFF0",
"D c #A2B1B3",
"E c #8FA4A8",
"F c #D7E2E5",
"G c #798F94",
"H c #151819",
"I c #F3B5A7",
"J c #865E55",
"K c #AFB9BB",
"L c #F1F8F9",
"M c #F7FBFB",
"N c #D9EBEF",
"O c #ECF4F6",
"P c #F3F7F7",
"Q c #E9F2F4",
"R c #EEF2F3",
"S c #E9EDEE",
"T c #C5C8C9",
"U c #C2C6C8",
"V c #E0E7E7",
"W c #DDEAED",
"X c #7A9DA5",
"Y c #EB8169",
"Z c #B83618",
"` c #924E3C",
" . c #9FA5A6",
".. c #E3EEF0",
"+. c #ECF5F7",
"@. c #D6EAED",
"#. c #CBE4E9",
"$. c #747C7D",
"%. c #B43518",
"&. c #E76A4D",
"*. c #B53F24",
"=. c #CB705A",
"-. c #C4D8DB",
";. c #D2E6E9",
">. c #CAE3E8",
",. c #A9C8CF",
"'. c #EC927D",
"). c #E66F54",
"!. c #D26951",
"~. c #F1A897",
"{. c #E76547",
"]. c #C58B7D",
"^. c #A8ABAC",
"/. c #70A1AB",
"(. c #DF421E",
"_. c #C43A1A",
":. c #E17055",
"<. c #DD8D7A",
"[. c #FFFFFF",
"}. c #030505",
"|. c #A2432E",
"1. c #AC3316",
" ",
" ",
" . + @ ",
" # $ % & * . ",
" = - ; > , ' ) ! ",
" ~ { ] ^ / ( _ : < [ } ",
" | 1 2 3 4 5 6 7 8 9 0 a b ",
" c d e f g h i j k l m n o p q r ",
" s t u v w / x y z A B C D E F G H ",
" s s I J K L M N O P Q R S T U V W X < ",
"s I Y Z ` ...+.@.#.$.s s s s s s s s s s s s ",
"s %.&.Y *.=.-.;.>.,.s '.).).).).).).).).).).!.s ",
"s %.%.%.&.~.{.].^./.s ).(.(.(.(.(.(.(.(.(.(._.s ",
"s %.%.%.%.%.&.~.:.<.s ).(.[.[.(.(.(.(.[.[.(._.s ",
" s s %.%.%.%.%.&.~.s ).(.[.[.[.(.(.[.[.[.(._.s ",
" s s %.%.%.%.%.s ).(.(.[.[.[.[.[.[.(.(._.s ",
" s s %.%.%.s ).(.(.(.[.[.[.[.(.(.(._.s ",
" }.s s |.s ).(.(.(.[.[.[.[.(.(.(._.s ",
" s s s ).(.(.[.[.[.[.[.[.(.(._.s ",
" s ).(.[.[.[.(.(.[.[.[.(._.s ",
" s ).(.[.[.(.(.(.(.[.[.(._.s ",
" s ).(.(.(.(.(.(.(.(.(.(._.s ",
" s !._._._._._._._._._._.1.s ",
" s s s s s s s s s s s s "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/outbox.xpm
Index: outbox.xpm
===================================================================
/* XPM */
static char * stock_outbox_xpm[] = {
"24 24 69 1",
" c None",
". c #000000",
"+ c #E66040",
"@ c #EE937E",
"# c #E55E3F",
"$ c #E1431F",
"% c #EC8770",
"& c #F0A08E",
"* c #F3B7A9",
"= c #EF9985",
"- c #E76749",
"; c #ED8C75",
"> c #F5BEB1",
", c #F3B4A5",
"' c #F4B8AA",
") c #F1A593",
"! c #E55B3B",
"~ c #E45534",
"{ c #F4BDB0",
"] c #F4BAAC",
"^ c #EF9C89",
"/ c #E34E2B",
"( c #C0391A",
"_ c #8A2912",
": c #3E3E3C",
"< c #D4D3D2",
"[ c #DB411D",
"} c #F1A999",
"| c #D23E1C",
"1 c #812611",
"2 c #C7C7C5",
"3 c #ACABA8",
"4 c #6A6966",
"5 c #E9775D",
"6 c #CECDCC",
"7 c #A93217",
"8 c #9B9A97",
"9 c #494846",
"0 c #9A9996",
"a c #BBBBB9",
"b c #747370",
"c c #A5A4A1",
"d c #AAA9A6",
"e c #686765",
"f c #7D7C79",
"g c #686764",
"h c #9C9B98",
"i c #999895",
"j c #ABAAA7",
"k c #A9A8A5",
"l c #AF3417",
"m c #E55D3D",
"n c #C5C5C3",
"o c #8D8C89",
"p c #626260",
"q c #B2B1AE",
"r c #A7A6A3",
"s c #B4B4B2",
"t c #C3C3C1",
"u c #92918E",
"v c #D1D0CF",
"w c #373735",
"x c #CACAC8",
"y c #A8A7A4",
"z c #CCCCCA",
"A c #52514E",
"B c #C8C8C6",
"C c #B5B5B3",
"D c #7E7D7A",
" . ",
" .. ",
" .+. ",
" ....@#. ",
" .$%&*=@-. ",
" .;>,')@@@!. ",
" .~{]*^@@@@(a)-.",
" ...@>/((((((_. ",
" .:<.[}|((((((1. ",
" ..234.5+(_...(1. ",
" ..63444.@(7...._. ",
" ..6344448.(a)(.90a.. ",
".634444bcd.#$.eff.a.. ",
".gh34bijkk.lm.iffff0a. ",
".ggghniikdo..pddiffffq. ",
".ggggghniikdkkkdddiffr. ",
" ..ggggghniikdkkdddsta. ",
" ..ggggghnurdkksvvw. ",
" ..gggggxrdyzvA.. ",
" ...gggB3qCA.. ",
" ...gDv... ",
" ..... ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/refresh.xpm
Index: refresh.xpm
===================================================================
/* XPM */
static char * stock_refresh_xpm[] = {
"24 24 86 1",
" c None",
". c #000000",
"+ c #F3F6F8",
"@ c #C8D4DF",
"# c #F7F9FA",
"$ c #0D110C",
"% c #6286A5",
"& c #A0B6C9",
"* c #C9D5E0",
"= c #F2F5F7",
"- c #172116",
"; c #819EB6",
"> c #CAD6E1",
", c #CCD7E1",
"' c #CED9E3",
") c #F6F8F9",
"! c #7192AE",
"~ c #587B99",
"{ c #CDD8E2",
"] c #CFDAE4",
"^ c #D3DDE6",
"/ c #D5DEE6",
"( c #ADC0D0",
"_ c #90A9BF",
": c #537490",
"< c #23323E",
"[ c #85A1B8",
"} c #5E83A3",
"| c #6084A3",
"1 c #6689A7",
"2 c #678AA8",
"3 c #48657D",
"4 c #A8BCCD",
"5 c #7393AE",
"6 c #6B8DAA",
"7 c #5C81A1",
"8 c #5D82A2",
"9 c #6588A6",
"0 c #435F76",
"a c #B1C3D2",
"b c #50718D",
"c c #9FB5C8",
"d c #94ACC1",
"e c #425D73",
"f c #435E74",
"g c #B4C5D3",
"h c #6C8EAB",
"i c #C4D2DD",
"j c #5B80A0",
"k c #456178",
"l c #7595B0",
"m c #BFCEDA",
"n c #597D9C",
"o c #A3B8CA",
"p c #B0C2D1",
"q c #86A2B9",
"r c #6E8FAB",
"s c #E1E8EE",
"t c #B9C9D6",
"u c #6387A6",
"v c #4C6B85",
"w c #7F9DB6",
"x c #BCCCD9",
"y c #DDE5EC",
"z c #E4EAEF",
"A c #D8E1E9",
"B c #D1DBE4",
"C c #C7D3DE",
"D c #B7C8D6",
"E c #7091AD",
"F c #537592",
"G c #9DB3C6",
"H c #8CA7BD",
"I c #304353",
"J c #4E6E89",
"K c #829FB7",
"L c #92ABC0",
"M c #C5D3DE",
"N c #7C9AB3",
"O c #5A7E9D",
"P c #47647C",
"Q c #6185A4",
"R c #5B7F9E",
"S c #4F6F8A",
"T c #405A71",
"U c #283926",
" . ",
" .. ",
" .+. ",
" ....@#. ",
" $%&@@**=. .. ",
" -;@@**>,'). .!~. ",
" .%@**>,{]^/(. ._:. ",
" <&@[}}|%123. .4. ",
".5@678|%920. .ab. ",
".cd7e...1f. . .gh. ",
".ijb. .k. .. .al. ",
".mn. .. .'. .op5. ",
".qr. . .*s...at4u. ",
".vw. .xyzyABCDEF. ",
" .G. .p'B,@ixaH2I. ",
" .JK. .LM@,>>MmNOP. ",
" .F9. .9|%Q|}7RS.. ",
" .. .|R~~nJT.. ",
" .j~.... ",
" UO. ",
" .. ",
" . ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/reply-all.xpm
Index: reply-all.xpm
===================================================================
/* XPM */
static char * stock_mail_reply_to_all_xpm[] = {
"24 24 149 2",
" c None",
". c #000000",
"+ c #ADA99C",
"@ c #E6E1D0",
"# c #F0EAD9",
"$ c #A9A598",
"% c #141416",
"& c #161618",
"* c #080809",
"= c #DBD6C7",
"- c #1B1B1C",
"; c #050505",
"> c #5A5A5A",
", c #676767",
"' c #020202",
") c #807D76",
"! c #D49A3E",
"~ c #D2973B",
"{ c #040402",
"] c #6D6B6B",
"^ c #7A7979",
"/ c #030100",
"( c #040100",
"_ c #282724",
": c #DD9831",
"< c #DA962F",
"[ c #1A0E01",
"} c #BC6D1B",
"| c #BE6E13",
"1 c #BE6D13",
"2 c #BD6C13",
"3 c #3E3C36",
"4 c #D69029",
"5 c #D18D27",
"6 c #737067",
"7 c #110900",
"8 c #CF791C",
"9 c #CE791C",
"0 c #CD761A",
"a c #C47013",
"b c #4A4136",
"c c #A0731E",
"d c #96691A",
"e c #000100",
"f c #291703",
"g c #BA6613",
"h c #8C4E0D",
"i c #844A0D",
"j c #BF6D13",
"k c #1F2A0D",
"l c #306220",
"m c #4F7242",
"n c #448D44",
"o c #2E802E",
"p c #3A6F3A",
"q c #FFFFFF",
"r c #535353",
"s c #171009",
"t c #AC600C",
"u c #713F0A",
"v c #693A0A",
"w c #AA5F0A",
"x c #192B10",
"y c #275926",
"z c #68A769",
"A c #358A36",
"B c #2D812D",
"C c #FBFBFB",
"D c #F7F7F7",
"E c #FAFAFA",
"F c #F5F5F5",
"G c #4F4F4F",
"H c #AEAEAE",
"I c #141517",
"J c #6F767C",
"K c #534C46",
"L c #241609",
"M c #23180E",
"N c #484644",
"O c #354A4D",
"P c #050B07",
"Q c #4F7E4F",
"R c #399239",
"S c #2D852D",
"T c #297F29",
"U c #ACACAC",
"V c #C8C8C8",
"W c #151618",
"X c #6C7C8B",
"Y c #728EA9",
"Z c #5D6B78",
"` c #C8CBCD",
" . c #C3C7CD",
".. c #8090A2",
"+. c #5A728B",
"@. c #4E6479",
"#. c #111714",
"$. c #328732",
"%. c #2B7F2C",
"&. c #2B772C",
"*. c #434343",
"=. c #A0A0A0",
"-. c #D4D4D4",
";. c #25282A",
">. c #8A9EB4",
",. c #6A86A1",
"'. c #596A7C",
"). c #DDE1E4",
"!. c #DCE2E7",
"~. c #899CAC",
"{. c #687E96",
"]. c #546D87",
"^. c #10161D",
"/. c #8C8C8C",
"(. c #959595",
"_. c #E4E4E4",
":. c #23282D",
"<. c #8096AB",
"[. c #5D7996",
"}. c #53687D",
"|. c #CDD3D9",
"1. c #CBD2DC",
"2. c #899BAB",
"3. c #CCD4DC",
"4. c #5C748C",
"5. c #111820",
"6. c #4D4D4D",
"7. c #818181",
"8. c #C6C6C6",
"9. c #1F252B",
"0. c #6B8197",
"a. c #536D89",
"b. c #4A5D6F",
"c. c #81919F",
"d. c #8293A4",
"e. c #5A7087",
"f. c #496481",
"g. c #445D79",
"h. c #0E151B",
"i. c #6A6A6A",
"j. c #0E141A",
"k. c #0D1319",
"l. c #0E141B",
"m. c #0E131A",
"n. c #0F141A",
"o. c #636363",
"p. c #737373",
"q. c #7C7C7C",
"r. c #BCBCBC",
" ",
" . . ",
" + @ # $ . ",
" % & * = # # # . ",
" - ; > , ' ) ! ~ # . ",
" { ] ^ / ( _ : < # . ",
" [ } | 1 2 3 4 5 # 6 ",
" 7 8 9 0 a b c d # # . e . . . . . . ",
" f g h i j k l m n o p . q q q q q r . ",
" s t u v w x y z A o B . C D E F G H . ",
" I J K L M N O P Q R S T . F F F G U V . ",
" W X Y Z ` ...+.@.#.$.%.&.. F F *.=.-.V . ",
" ;.>.,.'.).!.~.{.].^.. . . /.F G (.-._.V . ",
":.<.[.}.|.1.2.3.4.5.F F F F 6.7.8._._.V . ",
" 9.0.a.b.c.d.e.f.g.h.F F F G i.=._.F _.V . ",
" j.k.l.l.l.j.m.n.o.G F G (.8.p.8.F _.V . ",
" . q C F o.8.F _.-.G U 8._.F q._._.V . ",
" . q F p.-.F F F F _._.F F F F q._.V . ",
" . q q.-._._._._._._._._._._._._.q.V . ",
" . p.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.o.. ",
" . . . . . . . . . . . . . . . . . . ",
" ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/save-draft.xpm
Index: save-draft.xpm
===================================================================
/* XPM */
static char * stock_mail_handling_xpm[] = {
"24 24 72 1",
" c None",
". c #000000",
"+ c #BCBCBC",
"@ c #FFFFFF",
"# c #535353",
"$ c #EEEEEE",
"% c #4F4F4F",
"& c #F5F5F5",
"* c #FBFBFB",
"= c #F7F7F7",
"- c #FAFAFA",
"; c #AEAEAE",
"> c #E4E4E4",
", c #434343",
"' c #ACACAC",
") c #C8C8C8",
"! c #A0A0A0",
"~ c #D4D4D4",
"{ c #959595",
"] c #3E3E3E",
"^ c #4D4D4D",
"/ c #818181",
"( c #C6C6C6",
"_ c #6A6A6A",
": c #636363",
"< c #B9B9B9",
"[ c #737373",
"} c #010101",
"| c #AAAAAA",
"1 c #0B0B0B",
"2 c #0C0C0C",
"3 c #060606",
"4 c #E4E3E1",
"5 c #050505",
"6 c #B3B3B1",
"7 c #484641",
"8 c #9F9D96",
"9 c #888781",
"0 c #7C7C7C",
"a c #B0AFAD",
"b c #A8A7A1",
"c c #908E86",
"d c #97958E",
"e c #807D74",
"f c #969696",
"g c #090909",
"h c #595854",
"i c #605E57",
"j c #898883",
"k c #76746B",
"l c #43423F",
"m c #282724",
"n c #363430",
"o c #6D6B63",
"p c #E2E2E1",
"q c #B6B5AF",
"r c #21201E",
"s c #0A0908",
"t c #181816",
"u c #E6E6E4",
"v c #65635C",
"w c #161614",
"x c #8C8B89",
"y c #DFDEDC",
"z c #B0AFA9",
"A c #D5D4D1",
"B c #93918B",
"C c #D6D5D2",
"D c #ABA9A3",
"E c #5D5C55",
"F c #494943",
"G c #42413C",
" ",
" ................. ",
" .+@@@@@@@@@@@@@@@#. ",
" .$%&*&*=*&*&*=-&%;. ",
" .@>,&&&&&&&&&&&%'). ",
" .@&>%&&&&&&&&&,!~). ",
" .@*&>,&&&&&&&%{~>). ",
" .@&&&>]&&&&&^/(>>). ",
" .@*&&&_,&&&%_!>&>). ",
" .@&&&:<<%&%{([(}}}. ",
" .@*&:(&>~%'|12:345... ",
" .(a)&[~&&&&>>2>62787.9.. ",
" .@0~>>>>>>>1ab888cde7. ",
" .[+++++++++fg88hijek. ",
" ...........78ilmn8o7..",
" .pq8hrstuevi.",
" ..78jnwxyv7..",
" .zequABv. ",
" .CD8eekkE7. ",
" ..h.7k7.F.. ",
" .. .G. .. ",
" ... ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/save.xpm
Index: save.xpm
===================================================================
/* XPM */
static char * mail_save_xpm[] = {
"24 24 264 2",
" c None",
". c #000000",
"+ c #141414",
"@ c #262626",
"# c #212121",
"$ c #1F1F1F",
"% c #1E1E1E",
"& c #1D1D1D",
"* c #202020",
"= c #232323",
"- c #292929",
"; c #171717",
"> c #121212",
", c #B8B8B8",
"' c #FFFFFF",
") c #A8A8A8",
"! c #0E0E0E",
"~ c #595959",
"{ c #444444",
"] c #4F4F4F",
"^ c #050505",
"/ c #222222",
"( c #3D3D3D",
"_ c #FEFEFE",
": c #FCFCFC",
"< c #FDFDFD",
"[ c #CACACA",
"} c #191919",
"| c #B3B1B0",
"1 c #EEECEB",
"2 c #F0DCAA",
"3 c #E5C470",
"4 c #DFB84F",
"5 c #8A681F",
"6 c #100E09",
"7 c #FBFBFB",
"8 c #515151",
"9 c #F0F0F0",
"0 c #D6D6D6",
"a c #EEECE9",
"b c #E6D498",
"c c #EED682",
"d c #EED680",
"e c #E3C15E",
"f c #D29815",
"g c #976E15",
"h c #7F5B0A",
"i c #1C190F",
"j c #D9D9D9",
"k c #424242",
"l c #F1F1F1",
"m c #F3F3F3",
"n c #EBE9E5",
"o c #CBB771",
"p c #735817",
"q c #C6A546",
"r c #E3C05D",
"s c #BC8710",
"t c #AD7C10",
"u c #6B6B6B",
"v c #A0A0A0",
"w c #535353",
"x c #505050",
"y c #AE9C5C",
"z c #292928",
"A c #CECDCA",
"B c #CAC9C7",
"C c #1A1917",
"D c #9C7E2B",
"E c #AB7C12",
"F c #242012",
"G c #555555",
"H c #DEDEDE",
"I c #E8E8E8",
"J c #3B3B3B",
"K c #D7D6D6",
"L c #656462",
"M c #DAD9D7",
"N c #E1E0DF",
"O c #1A1A19",
"P c #3D351F",
"Q c #A37819",
"R c #231F13",
"S c #282828",
"T c #898989",
"U c #EFEFEF",
"V c #FAFAFA",
"W c #E8E7E6",
"X c #8B8B8A",
"Y c #0B0B06",
"Z c #A97C1A",
"` c #1B1B1B",
" . c #C9C9C9",
".. c #DFDFDF",
"+. c #EBEBEB",
"@. c #ECECEC",
"#. c #E1E1E1",
"$. c #221E11",
"%. c #EAE8E3",
"&. c #C58F13",
"*. c #B68411",
"=. c #826321",
"-. c #302C19",
";. c #131313",
">. c #1A1A1A",
",. c #161616",
"'. c #151515",
"). c #181818",
"!. c #1B1B1A",
"~. c #141413",
"{. c #363220",
"]. c #916F25",
"^. c #322F1E",
"/. c #98B4C8",
"(. c #25313B",
"_. c #A9CCE0",
":. c #545A68",
"<. c #BC6A60",
"[. c #AD5A51",
"}. c #A4574D",
"|. c #2B2719",
"1. c #353120",
"2. c #5A4D51",
"3. c #6E8DA2",
"4. c #0C1820",
"5. c #BAE5FF",
"6. c #696E6F",
"7. c #F9F9F9",
"8. c #EBEBEA",
"9. c #937025",
"0. c #CDCAC1",
"a. c #73726E",
"b. c #7496AF",
"c. c #0A131A",
"d. c #BAE0FD",
"e. c #6A6E71",
"f. c #ECEDEC",
"g. c #DEDFDF",
"h. c #DBDDDD",
"i. c #D8DBDB",
"j. c #CDCFCF",
"k. c #312E1B",
"l. c #2F2C19",
"m. c #B2B3B0",
"n. c #C0C0BE",
"o. c #6F6D6B",
"p. c #7C9FBB",
"q. c #050F15",
"r. c #B7DDFC",
"s. c #54575A",
"t. c #F4F4F3",
"u. c #ECECEB",
"v. c #F3F3F2",
"w. c #7F7D7A",
"x. c #7EA0BB",
"y. c #020A10",
"z. c #B1D7F7",
"A. c #FDFCFB",
"B. c #EFEFEE",
"C. c #EDEDEC",
"D. c #EBECEB",
"E. c #EBECEC",
"F. c #F7F7F6",
"G. c #7D7977",
"H. c #7F9FB9",
"I. c #050B0E",
"J. c #B3DDF7",
"K. c #685050",
"L. c #847F7C",
"M. c #7E9DB7",
"N. c #0A0B0C",
"O. c #A9D3F0",
"P. c #7B99AB",
"Q. c #6B6E70",
"R. c #63696C",
"S. c #60666B",
"T. c #5E6569",
"U. c #555E67",
"V. c #5D6267",
"W. c #61676B",
"X. c #64696D",
"Y. c #62666A",
"Z. c #6B747E",
"`. c #7D9CB4",
" + c #000508",
".+ c #A8CBED",
"++ c #7498B7",
"@+ c #6F92B0",
"#+ c #3F5160",
"$+ c #4A5E70",
"%+ c #566E82",
"&+ c #4D6779",
"*+ c #52697C",
"=+ c #52697A",
"-+ c #54687A",
";+ c #455E70",
">+ c #7697B4",
",+ c #92A9BC",
"'+ c #000205",
")+ c #A8CEEB",
"!+ c #7196B3",
"~+ c #4D5152",
"{+ c #D7D2CB",
"]+ c #F1EEEA",
"^+ c #FAF8F5",
"/+ c #F9F8F5",
"(+ c #E8E4DF",
"_+ c #D8D4CD",
":+ c #9D968B",
"<+ c #425563",
"[+ c #446783",
"}+ c #A7C4DA",
"|+ c #000101",
"1+ c #A5CDEA",
"2+ c #7196B1",
"3+ c #57595C",
"4+ c #534F46",
"5+ c #2E281F",
"6+ c #CAC7C2",
"7+ c #C9C4BD",
"8+ c #C2BBB1",
"9+ c #E3E0DC",
"0+ c #314353",
"a+ c #40647C",
"b+ c #B6C9DA",
"c+ c #A3CDEB",
"d+ c #7695B1",
"e+ c #525455",
"f+ c #474239",
"g+ c #3B372D",
"h+ c #C0BCB5",
"i+ c #C7C2BA",
"j+ c #E2DFD9",
"k+ c #F8F6F3",
"l+ c #344652",
"m+ c #406479",
"n+ c #A6C3DA",
"o+ c #010000",
"p+ c #708798",
"q+ c #6A8DA7",
"r+ c #4F5052",
"s+ c #F7F2EC",
"t+ c #59534B",
"u+ c #57524A",
"v+ c #C1BCB4",
"w+ c #EBE9E4",
"x+ c #FFFFFD",
"y+ c #30414E",
"z+ c #415C6F",
"A+ c #A2C4DC",
"B+ c #020000",
"C+ c #030406",
"D+ c #141A1F",
"E+ c #151718",
"F+ c #35332F",
"G+ c #393634",
"H+ c #41403E",
"I+ c #3F3E3D",
"J+ c #454344",
"K+ c #434241",
"L+ c #312F2C",
"M+ c #02070A",
"N+ c #070E12",
"O+ c #465A69",
". + @ # $ % & & & % * = - ; . ",
"> , ' ' ' ' ' ' ' ' ' ' ' ) !
",
"@ ' ~ ' ' ' ' ' ' ' ' ' { ] ^ . . .
",
"/ ' ' ( ' _ : < < ' [ } | 1 2 3 4 5 . 6 ",
"* ' ' 7 8 9 < 7 _ 0 @ a b c d d e f g h i ",
"$ ' ' ' j k l : m $ n o . . . p q r s t i ",
"* ' ' ' u v w ' x . y z A B C D d f E F ",
"/ ' ' G H 7 I J , K > L M N O P d f Q R ",
"S ' T U ' ' ' _ V ' < W X Y . . . d f Z . . . ",
"` ...U +.+.+.@.@.+.@.+.#.$.%.d d d f &.*.=.-.. ",
". ;.>.; ,.'.'.'.'.'.,.).!.~.{.%.d d f f ].^./.(.",
" . _.:.<.[.}.|.%.d f ].1.2.3.4.",
" . 5.6.' ' 7.8.-.%.9.^.0.a.b.c.",
" . d.e.f.g.h.i.j.k.l.m.n.o.p.q.",
" . r.s.' ' ' ' ' ' t.u.v.w.x.y.",
" . z.6.A.B.C.D.+.E.C.U F.G.H.I.",
" . J.K.' ' ' ' ' ' ' ' '
L.M.N.",
" . O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +",
" . .+++@+#+$+%+&+*+=+-+;+>+,+'+",
" . )+!+~+{+]+^+/+(+_+:+<+[+}+|+",
" . 1+2+3+' 4+5+6+7+8+9+0+a+b+. ",
" . c+d+e+' f+g+h+i+j+k+l+m+n+o+",
" . p+q+r+s+t+u+v+w+x+]+y+z+A+B+",
" C+D+E+F+G+H+I+J+K+L+M+N+O+. "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/send.xpm
Index: send.xpm
===================================================================
/* XPM */
static char * stock_mail_send_xpm[] = {
"24 24 58 1",
" c None",
". c #4F3F0A",
"+ c #000000",
"@ c #F4E6B5",
"# c #F4E5B3",
"$ c #EDD684",
"% c #755F10",
"& c #EDD580",
"* c #EED685",
"= c #AF8D18",
"- c #EFD98C",
"; c #EED88B",
"> c #EDD582",
", c #EED889",
"' c #EFDA92",
") c #F0DB93",
"! c #735D10",
"~ c #535353",
"{ c #FFFFFF",
"] c #F0DC97",
"^ c #F6F6F6",
"/ c #F5F5F5",
"( c #F4F4F4",
"_ c #E3E3E3",
": c #EEEEEE",
"< c #4F4F4F",
"[ c #EDD37C",
"} c #EDEDED",
"| c #AEAEAE",
"1 c #E4E4E4",
"2 c #434343",
"3 c #FDFDFD",
"4 c #F3F3F3",
"5 c #E4BF3D",
"6 c #CBA41C",
"7 c #D1A81C",
"8 c #907413",
"9 c #7C6411",
"0 c #ACACAC",
"a c #C8C8C8",
"b c #FBFBFB",
"c c #A0A0A0",
"d c #D4D4D4",
"e c #F8F8F8",
"f c #F0F0F0",
"g c #EFEFEF",
"h c #ECECEC",
"i c #959595",
"j c #3E3E3E",
"k c #4D4D4D",
"l c #818181",
"m c #C6C6C6",
"n c #6A6A6A",
"o c #636363",
"p c #B9B9B9",
"q c #737373",
"r c #7C7C7C",
"s c #BCBCBC",
" ",
" . ",
" +@+ ",
" +#$%+ ",
" +#&*=%+ ",
" +#-;>==%+ ",
" +#,',>===%+ ",
" ++++++)$&=!++++++ ",
" +~{{{{+]$$=!+^/(_~+ ",
" +:<{/(+,[$=!+:}_<|+ ",
" +{1234+56789+}_<0a+ ",
" +{/1<b+++++++_2cda+ ",
" +{b/12efg:}h_<id1a+ ",
" +{///1j/:}h_klm11a+ ",
" +{b//1n24h_<nmm/1a+ ",
" +{//1o{p<f<imqm/1a+ ",
" +{b1o{/1d<0m11r11a+ ",
" +{1q{////11///1r1a+ ",
" +{r{111111111111ra+ ",
" +qssssssssssssssso+ ",
" ++++++++++++++++++ ",
" ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/separator.xpm
Index: separator.xpm
===================================================================
/* XPM */
static char * sep_xpm[] = {
"1 24 2 1",
" c None s backgroundToolBarColor",
". c #776758",
" ",
" ",
" ",
".",
".",
".",
".",
".",
".",
".",
".",
".",
".",
".",
".",
".",
".",
".",
".",
".",
".",
" ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/sort-ascending.xpm
Index: sort-ascending.xpm
===================================================================
/* XPM */
static char * stock_sort_ascending_xpm[] = {
"23 23 7 1",
" c None",
". c #314E6C",
"+ c #000000",
"@ c #D1DECF",
"# c #7DA377",
"$ c #E4ECE3",
"% c #B3C9AF",
" ",
" .... ",
" .. .. ",
" .. .. ",
" ...... ",
" .. .. ",
" .. .. ",
" ",
" + ",
" ",
" + ",
" ",
" + + ",
" +@+ + ",
" +@##+ ++ ++++++ ",
" +###+$+ +++ ",
" +##%#+ +++ ",
" +%##+ +++ ",
" +$###+ +++ ",
" +++++++ ++++++ ",
" ",
" ",
" "};
1.1
XEmacs/packages/xemacs-packages/gnus/etc/gnus/sort-column-ascending.xpm
Index: sort-column-ascending.xpm
===================================================================
/* XPM */
static char * stock_sort_column_ascending_xpm[] = {
"24 24 2 1",
" c None",
". c #000000",
" ",
" ",
" ... ",
" . .. ",
" .. ",
" .. ",
" .. ",
" .. ",
" .. ",
" ..... . ",
" ",
" . ",
" ",
" . ",
" .... ",
" .. .. ",
" .. .. ",
" .. .. ",
" ..... ",
" .. ",
" . ... ",
" ..... ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/sort-criteria.xpm
Index: sort-criteria.xpm
===================================================================
/* XPM */
static char * stock_sort_criteria_xpm[] = {
"24 24 28 1",
" c None",
". c #000000",
"+ c #FFFFFF",
"@ c #D3D3D3",
"# c #F2ECE1",
"$ c #F4EFE5",
"% c #DFDAD2",
"& c #C9C4BD",
"* c #74716E",
"= c #FAFAFA",
"- c #EADFC9",
"; c #ECE2CF",
"> c #EEE5D4",
", c #4C4B48",
"' c #F5F5F5",
") c #C9C9C9",
"! c #E2D2B1",
"~ c #CFC4B1",
"{ c #BFBFBF",
"] c #C0C0C0",
"^ c #C7B99C",
"/ c #F0F0F0",
"( c #B7B7B7",
"_ c #9A8F78",
": c #877E69",
"< c #AFA389",
"[ c #A09889",
"} c #314E6C",
" ",
" ",
" ...... ",
" ... ",
" ... ",
" ... ",
" ......... ... ",
" .+@.#$%&*. ...... ",
" .=@.-;;;>, ",
" .').!!!!.~. ",
" .{].^^!.^.~. ",
" ./(.._.^.:.~. ",
" .....<.:...[. ",
" .:.. .. ",
" .. ",
" ",
" }}}} ",
" }} }} ",
" }} }} ",
" }}}}}} ",
" }} }} ",
" }} }} ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/sort-descending.xpm
Index: sort-descending.xpm
===================================================================
/* XPM */
static char * stock_sort_descending_xpm[] = {
"24 23 7 1",
" c None",
". c #000000",
"+ c #D1DECF",
"@ c #7DA377",
"# c #314E6C",
"$ c #E4ECE3",
"% c #B3C9AF",
" ",
" ",
" ...... ",
" ... ",
" ... ",
" ... ",
" ... ",
" ...... ",
" . ",
" ",
" . ",
" ",
" . . ",
" .+. . ",
" .+@@. .. #### ",
" .@@@.$. ## ## ",
" .@@%@. ## ## ",
" .%@@. ###### ",
" .$@@@. ## ## ",
" ....... ## ## ",
" ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/sort-row-ascending.xpm
Index: sort-row-ascending.xpm
===================================================================
/* XPM */
static char * stock_sort_row_ascending_xpm[] = {
"21 17 2 1",
" c None",
". c #000000",
" ",
" ",
" ",
" ",
" ... .... ",
" . .. .. .. ",
" .. .. .. ",
" .. .. .. ",
" .. ..... ",
" .. .. ",
" .. . .. ",
" ..... . . . ..... ",
" ",
" ",
" ",
" ",
" "};
1.1 XEmacs/packages/xemacs-packages/gnus/etc/gnus/spam.xpm
Index: spam.xpm
===================================================================
/* XPM */
static char * stock_spam_xpm[] = {
"24 24 190 2",
" c None",
". c #1D1E1E",
"+ c #333839",
"@ c #393F40",
"# c #171819",
"$ c #B2B8B9",
"% c #D5E3E7",
"& c #AABABD",
"* c #64696A",
"= c #0C0D0D",
"- c #929C9E",
"; c #E7F0F3",
"> c #EDF0F1",
", c #E5EDEF",
"' c #C5D9DD",
") c #2E3132",
"! c #3F4343",
"~ c #1F2121",
"{ c #DFEBEE",
"] c #B7C4C8",
"^ c #D2D9DA",
"/ c #E1EFF2",
"( c #B6CBCF",
"_ c #3C4547",
": c #1E2223",
"< c #191E1F",
"[ c #2D2E2F",
"} c #191A1A",
"| c #252829",
"1 c #7E8E92",
"2 c #B7C2C3",
"3 c #C3D9DD",
"4 c #9CACB0",
"5 c #C3CDCE",
"6 c #C7E1E7",
"7 c #668F97",
"8 c #90ACB2",
"9 c #CDDDE1",
"0 c #485559",
"a c #88A6AC",
"b c #1F2223",
"c c #3F4545",
"d c #242728",
"e c #313B3E",
"f c #A8C2C8",
"g c #B2BDC0",
"h c #CFE5E9",
"i c #C2D9DE",
"j c #81989C",
"k c #A2C0C5",
"l c #85A9B1",
"m c #E5ECEE",
"n c #E7F2F4",
"o c #9BAEB3",
"p c #C8E1E7",
"q c #3A3E3F",
"r c #0C0E0E",
"s c #000000",
"t c #333737",
"u c #B3C2C5",
"v c #DDEDF0",
"w c #D8E4E6",
"x c #DAECEF",
"y c #D5E9ED",
"z c #D2E7EC",
"A c #95ADB2",
"B c #DBE2E2",
"C c #EDEFF0",
"D c #A2B1B3",
"E c #8FA4A8",
"F c #D7E2E5",
"G c #798F94",
"H c #151819",
"I c #F3B5A7",
"J c #865E55",
"K c #AFB9BB",
"L c #F1F8F9",
"M c #F7FBFB",
"N c #D9EBEF",
"O c #ECF4F6",
"P c #F3F7F7",
"Q c #E9F2F4",
"R c #EEF2F3",
"S c #E9EDEE",
"T c #C5C8C9",
"U c #C2C6C8",
"V c #E0E7E7",
"W c #DDEAED",
"X c #7A9DA5",
"Y c #EB8169",
"Z c #B83618",
"` c #924E3C",
" . c #9FA5A6",
".. c #E3EEF0",
"+. c #ECF5F7",
"@. c #D6EAED",
"#. c #CBE4E9",
"$. c #D9E7E9",
"%. c #E1EBED",
"&. c #B8CBD0",
"*. c #BDCBCF",
"=. c #ABB3B5",
"-. c #E3E5E5",
";. c #DCEBEF",
">. c #6A979F",
",. c #131819",
"'. c #B43518",
"). c #E76A4D",
"!. c #B53F24",
"~. c #CB705A",
"{. c #C4D8DB",
"]. c #D2E6E9",
"^. c #CAE3E8",
"/. c #A9C8CF",
"(. c #7FA4AA",
"_. c #82B4BE",
":. c #E2EFF0",
"<. c #D3E7EA",
"[. c #AFD5DE",
"}. c #C7E2E7",
"|. c #E7F1F2",
"1. c #97C3CB",
"2. c #637F86",
"3. c #191311",
"4. c #EF9985",
"5. c #F1A897",
"6. c #E76547",
"7. c #C58B7D",
"8. c #A8ABAC",
"9. c #70A1AB",
"0. c #88B5BE",
"a. c #95C7D1",
"b. c #ADD4DC",
"c. c #DCEAEF",
"d. c #B5D8E0",
"e. c #CAE4E9",
"f. c #95BEC6",
"g. c #6696A0",
"h. c #585857",
"i. c #51190C",
"j. c #D9401D",
"k. c #EC8A74",
"l. c #E17055",
"m. c #DD8D7A",
"n. c #D8E7EA",
"o. c #D8E9ED",
"p. c #D6EAEE",
"q. c #D9EBEE",
"r. c #E4F0F3",
"s. c #CFE3E8",
"t. c #5B94A0",
"u. c #5C7E85",
"v. c #3D221D",
"w. c #782310",
"x. c #EA7A60",
"y. c #E5A293",
"z. c #EBD9D5",
"A. c #C6D3D6",
"B. c #799FA8",
"C. c #558C98",
"D. c #45686E",
"E. c #27201F",
"F. c #5D3228",
"G. c #B86F5D",
"H. c #F1A593",
"I. c #E58D78",
"J. c #C0C0C1",
"K. c #32464B",
"L. c #4A6E75",
"M. c #282121",
"N. c #4A2E27",
"O. c #C6968B",
"P. c #DDA89B",
"Q. c #5F1C0D",
"R. c #F2AFA0",
"S. c #A36F63",
"T. c #341C17",
"U. c #301A15",
"V. c #674C45",
"W. c #E4AEA1",
"X. c #8D2A13",
"Y. c #030505",
"Z. c #A2432E",
"`. c #E4A799",
" + c #D97C67",
".+ c #B66A59",
"++ c #B26C5C",
"@+ c #882812",
"#+ c #DB411D",
"$+ c #F4BAAC",
" ",
" ",
" ",
" ",
" . + @ ",
" # $ % & * . ",
" = - ; > , ' ) ! ",
" ~ { ] ^ / ( _ : < [ } ",
" | 1 2 3 4 5 6 7 8 9 0 a b ",
" c d e f g h i j k l m n o p q r ",
" s t u v w / x y z A B C D E F G H ",
" s s I J K L M N O P Q R S T U V W X < ",
"s I Y Z ` ...+.@.#.$.%.h &.*.=.-.;.>.,.s ",
"s '.).Y !.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.s ",
"s '.'.'.).5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.s ",
"s '.'.'.'.'.).5.l.m.n.o.p.q.r.s.t.u.v.w.j.x.s ",
" s s '.'.'.'.'.).5.6.y.z.A.B.C.D.E.F.G.H.4.s ",
" s s '.'.'.'.'.).5.I.J.K.L.M.N.O.P.Q.s ",
" s s '.'.'.'.'.R.S.T.U.V.W.X.s s ",
" Y.s s Z.'.'.`. +.+++@+s s ",
" s s s '.#+$+s s s ",
" s s s s s ",
" ",
" "};
1.1
XEmacs/packages/xemacs-packages/gnus/etc/gnus/toggle-subscription.xpm
Index: toggle-subscription.xpm
===================================================================
/* XPM */
static char * stock_task_recurring_xpm[] = {
"24 24 31 1",
" c None",
". c #000000",
"+ c #FFFFFF",
"@ c #F4E2BC",
"# c #F4D597",
"$ c #434343",
"% c #F0CC84",
"& c #EBB13D",
"* c #4B4B4B",
"= c #535353",
"- c #C8C8C8",
"; c #7D7D7D",
"> c #7C7C7C",
", c #858585",
"' c #5C5C5C",
") c #949494",
"! c #F2F2F2",
"~ c #B6B6B6",
"{ c #BDBDBD",
"] c #818181",
"^ c #878787",
"/ c #B2B2B2",
"( c #FDFDFD",
"_ c #DBDBDB",
": c #CCCCCC",
"< c #ECECEC",
"[ c #7F7F99",
"} c #333366",
"| c #8F8FA9",
"1 c #59597F",
"2 c #EEEEEE",
" ",
" . . . . . . . ",
" .+.+.+.+.+.+.+. ",
" .@.#.#.#.#.#.#. ",
" .$%$&*&*&=&=&$&*. ",
" .-*;*>*>*>*>=,'). ",
" .!>~>{]{]{]{]{^/. ",
" .(_:::::::::::_/. ",
" .+<<<<<<<<<<<<</. ",
" .+_::[}::}}}}:_/. ",
" .+<<|}<<<}}}<<</. ",
" .+_:}[:::}}1[:_/. ",
" .+<<}<<<<}<|}<</. ",
" .+_:}[:}::::}:_/. ",
" .+<<|}}}<<<|}<</. ",
" .+_::}}}:::}[:_/. ",
" .+<<}}}}<<}|<<</. ",
" .+_:::::::::::_/. ",
" .+<<<<<<<<<<<<</. ",
" .2//////////////. ",
" ................. ",
" ",
" ",
" "};
1.2 +34 -34 XEmacs/packages/xemacs-packages/gnus/lisp/ChangeLog.2.upstream
Index: ChangeLog.2.upstream
===================================================================
RCS file:
/pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/ChangeLog.2.upstream,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ChangeLog.2.upstream 2004/09/28 02:21:00 1.1
+++ ChangeLog.2.upstream 2006/03/16 04:17:40 1.2
@@ -50,7 +50,7 @@
* gnus-sum.el (gnus-select-newsgroup): Use cat.
* gnus-agent.el (gnus-agent-cat-enable-undownloaded-faces): New
- cat.
+ cat.
* gnus.el (gnus-user-agent): Moved here.
@@ -108,7 +108,7 @@
2003-12-31 Jeremy Maitin-Shepard <jbms(a)attbi.com>
* mml.el (mml-generate-mime-1): Use mml-compute-boundary (tiny
- change).
+ change).
2003-12-30 Reiner Steib <Reiner.Steib(a)gmx.de>
@@ -391,7 +391,7 @@
* gnus-cus.el (gnus-agent-customize-category): Added missing
agent-disable-undownloaded-faces parameter.
-
+
* gnus-start.el (gnus-activate-group): Backed out my 2003-11-29
patch as it was too late at adjusting the active range.
(gnus-get-unread-articles-in-group): Added call to new
@@ -401,7 +401,7 @@
* message.el (message-get-reply-headers): Narrow to headers.
-2003-12-10 Teodor Zlatanov <tzz(a)lifelogs.com>
+2003-12-10 Teodor Zlatanov <tzz(a)lifelogs.com>
* spam.el (spam-disable-spam-split-during-ham-respool): new
variable. From lorentey(a)elte.hu (L,Bu(Brentey K,Ba(Broly)
@@ -557,7 +557,7 @@
2003-11-30 Lars Magne Ingebrigtsen <larsi(a)gnus.org>
- * gnus-agent.el (gnus-agent-covered-methods): Remove nil methods.
+ * gnus-agent.el (gnus-agent-covered-methods): Remove nil methods.
2003-11-29 Kevin Greiner <kgreiner(a)xpediantsolutions.com>
* gnus-start.el (gnus-activate-group): The active range of the
@@ -813,16 +813,16 @@
nnmail-cache-insert
* nnmh.el (nnmh-request-accept-article): pass sender to
- nnmail-cache-insert
+ nnmail-cache-insert
* nnmbox.el (nnmbox-request-accept-article): pass sender to
- nnmail-cache-insert
+ nnmail-cache-insert
* nnfolder.el (nnfolder-request-accept-article): pass sender to
- nnmail-cache-insert
+ nnmail-cache-insert
* nnbabyl.el (nnbabyl-request-accept-article): pass sender to
- nnmail-cache-insert
+ nnmail-cache-insert
* nnmail.el (nnmail-cache-insert): accept sender parameter and
pass it to the nnmail-spool-hook
@@ -887,7 +887,7 @@
* gnus.el (gnus-group-guess-full-name-from-command-method): new function
* gnus-registry.el (gnus-registry-fetch-group): use long names if
- requested
+ requested
(gnus-registry-split-fancy-with-parent): when long names are in
use, strip the name if we're in the native server, or else return nothing
(gnus-registry-spool-action, gnus-registry-action): use
@@ -990,7 +990,7 @@
2003-10-27 Romain FRANCOISE <romain(a)orebokech.com>
- * gnus-art.el (gnus-article-goto-prev-page): Doc fix.
+ * gnus-art.el (gnus-article-goto-prev-page): Doc fix.
2003-10-27 Simon Josefsson <jas(a)extundo.com>
@@ -1069,7 +1069,7 @@
building with XEmacs so byte-compile it.
(dgnushack-make-load): When building with XEmacs do nothing except
byte-compile the autoload file and create a dummy gnus-load.el
- file.
+ file.
2003-10-23 Katsumi Yamaoka <yamaoka(a)jpl.org>
@@ -1128,7 +1128,7 @@
2003-10-21 Lars Magne Ingebrigtsen <larsi(a)gnus.org>
* gnus-picon.el (gnus-picon-transform-address): Protect against
- errors.
+ errors.
2003-10-20 Katsumi Yamaoka <yamaoka(a)jpl.org>
@@ -1140,12 +1140,12 @@
2003-10-20 Lars Magne Ingebrigtsen <larsi(a)gnus.org>
* spam-report.el (spam-report-url-ping-plain): Include a
- User-Agent.
+ User-Agent.
* gnus-msg.el (gnus-extended-version): Use it.
* gnus-util.el (gnus-emacs-version): Separated out into own
- function.
+ function.
2003-10-19 Reiner Steib <Reiner.Steib(a)gmx.de>
@@ -1181,15 +1181,15 @@
2003-10-18 Lars Magne Ingebrigtsen <larsi(a)gnus.org>
* pop3.el (pop3-read-response): Check whether the process is
- alive.
+ alive.
* gnus-sum.el (gnus-summary-refer-article): Strip spaces.
* rfc2047.el (rfc2047-encode-region): Do error out on invalid
- strings.
+ strings.
* nntp.el (nntp-retrieve-headers-with-xover): Get error messages
- right.
+ right.
* gnus-agent.el (gnus-agent-read-servers): Remove sit-for.
@@ -1198,14 +1198,14 @@
* message.el (message-field-value): New function.
(message-insert-disposition-notification-to): Use Reply-To, too.
- * imap.el (imap-mailbox-status): Upcase STATUS commands.
+ * imap.el (imap-mailbox-status): Upcase STATUS commands.
* gnus-sum.el (gnus-remove-odd-characters): New function.
(gnus-nov-parse-line): Use it.
2003-10-18 Matt Swift <swift(a)alum.mit.edu>
- * mm-decode.el (mm-inline-media-tests): Recognize pjpeg as jpeg.
+ * mm-decode.el (mm-inline-media-tests): Recognize pjpeg as jpeg.
2003-10-18 Romain FRANCOISE <romain(a)orebokech.com>
@@ -1269,14 +1269,14 @@
2003-10-17 Lars Magne Ingebrigtsen <larsi(a)gnus.org>
* gnus-sum.el (gnus-summary-enter-digest-group): ogroup, nor
- group.
+ group.
* gnus-msg.el (gnus-inews-insert-archive-gcc): Use the parent
name for gcc-self.
(gnus-inews-insert-archive-gcc): Paren mistake.
* gnus-sum.el (gnus-summary-enter-digest-group): Add
- parent-group.
+ parent-group.
* gnus-art.el (gnus-ignored-headers): Add more headers.
@@ -1297,7 +1297,7 @@
(mail-source-fetch-imap): Use them.
* nndraft.el (nndraft-request-move-article): Fix infinite
- recursion.
+ recursion.
* gnus-group.el (gnus-group-mark-regexp): Jump to groups.
@@ -1310,7 +1310,7 @@
* message.el (message-inserted-headers): New variable.
(message-mode): Make local.
- (message-mode): Set all the local action variables to nil.
+ (message-mode): Set all the local action variables to nil.
2003-10-16 Katsumi Yamaoka <yamaoka(a)jpl.org>
@@ -1368,7 +1368,7 @@
found (idea from Adrian Lanz <lanz(a)fowi.ethz.ch>)
(spam-check-bogofilter-headers, spam-check-blackholes, spam-check-BBDB)
(spam-from-listed-p): use nnmail-fetch-field instead of message-fetch-field
-
+
2003-10-03 Katsumi Yamaoka <yamaoka(a)jpl.org>
@@ -1439,7 +1439,7 @@
to MML. MIME -> MML -> MIME does not work for PGP/MIME.
* message.el (message-bounce, message-forward-show-mml): do.
-
+
2003-09-13 Jesper Harder <harder(a)ifa.au.dk>
* rfc2047.el (rfc2047-charset-encoding-alist): Add viscii.
@@ -1760,7 +1760,7 @@
2003-07-25 Teodor Zlatanov <tzz(a)lifelogs.com>
- * spam.el (spam-use-regex-body, spam-regex-body-spam)
+ * spam.el (spam-use-regex-body, spam-regex-body-spam)
(spam-regex-body-ham): new variables, default to nil/empty/empty
(spam-install-hooks): added spam-use-regex-body to list or
pre-install conditions
@@ -1947,7 +1947,7 @@
2003-06-24 Lars Magne Ingebrigtsen <larsi(a)gnus.org>
* gnus-ems.el (gnus-put-image): Mark the right text segment with
- gnus-image-category.
+ gnus-image-category.
* gnus-srvr.el (gnus-browse-unsubscribe-group): Strip prefix from
native groups.
@@ -2916,7 +2916,7 @@
* spam-report.el (spam-report-gmane): gnus-summary-article-number
is not necessary, just use the function parameter
-2003-04-29 Karl Pflysterer <sigurd(a)12move.de>
+2003-04-29 Karl Pfl,Ad(Bsterer <sigurd(a)12move.de>
* spam-stat.el (spam-stat-save): No longer font-locks the file
when saving
@@ -4809,7 +4809,7 @@
2003-02-20 Jesper Harder <harder(a)ifa.au.dk>
* gnus-spec.el (gnus-xmas-format): Use insert instead of
- insert-string which is obsolete in Emacs 21.4.
+ insert-string which is obsolete in Emacs 22.1.
* message.el (message-cross-post-followup-to-header): do.
@@ -7390,7 +7390,7 @@
instead of mm-auto-save-coding-system for the draft or delayed
group.
-2002-10-28 Josh <huber(a)alum.wpi.edu>
+2002-10-28 Josh Huber <huber(a)alum.wpi.edu>
* mml.el (mml-mode-map): Fixed keybindings for mml-secure-*
functions.
@@ -7658,7 +7658,7 @@
* spam.el: more compilation fixes for BBDB
- * spam-stat.el added code from Alex Schroeder <alex(a)gnu.org>
+ * spam-stat.el: added code from Alex Schroeder <alex(a)gnu.org>
(spam-stat-reduce-size): Interactive.
(spam-stat-reset): New function.
(spam-stat-save): Interactive.
@@ -12404,7 +12404,7 @@
2001-12-05 Katsumi Yamaoka <yamaoka(a)jpl.org>
- * mm-view.wl (mm-inline-text): Decode a charset-encoded rich text.
+ * mm-view.el (mm-inline-text): Decode a charset-encoded rich text.
2001-12-04 08:00:00 ShengHuo ZHU <zsh(a)cs.rochester.edu>
@@ -12604,7 +12604,7 @@
* nnfolder.el (nnfolder-read-folder): Use group instead of
nnfolder-current-group.
- Suggested by Lorentey Karoly <lorentey(a)elte.hu>.
+ Suggested by K,Ba(Broly L,Bu(Brentey <lorentey(a)elte.hu>.
2001-11-17 Simon Josefsson <jas(a)extundo.com>
1.10 +574 -47 XEmacs/packages/xemacs-packages/gnus/lisp/ChangeLog.upstream
Index: ChangeLog.upstream
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/ChangeLog.upstream,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ChangeLog.upstream 2006/01/04 07:05:29 1.9
+++ ChangeLog.upstream 2006/03/16 04:17:41 1.10
@@ -1,9 +1,527 @@
-2006-01-03 Steve Youngs <steve(a)sxemacs.org>
+2006-03-15 Andreas Seltenreich <uwi7(a)rz.uni-karlsruhe.de>
- * gnus-xmas.el (gnus-xmas-group-startup-message): Typo
+ * gnus-art.el (gnus-article-only-boring-p): Bind
+ inhibit-point-motion-hooks to avoid infinite loop when entering
+ intangible text. Reported by Ralf Wachinger
+ <rwnewsmampfer(a)geekmail.de>.
+
+2006-03-14 Simon Josefsson <jas(a)extundo.com>
+
+ * message.el (message-unique-id): Don't use message-number-base36
+ if (user-uid) is a float. Reported by Bjorn Solberg
+ <bjorn_ding1(a)hekneby.org>.
+
+2006-03-13 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * mm-uu.el (mm-uu-dissect): Dissect all parts correctly.
+
+ * gnus-art.el (gnus-mime-display-single): Make sure there is an
+ empty line between a part and a message part.
+
+2006-03-10 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * smiley.el: Add more test smileys.
+ (smiley-data-directory, smiley-regexp-alist)
+ (gnus-smiley-file-types): Fix doc strings.
+ (smiley-update-cache): Clear smiley-cached-regexp-alist before
+ adding new elements.
+ (smiley-mouse-map): Unused code. Make it a comment.
+
+2006-03-10 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * gnus-nocem.el (gnus-nocem-scan-groups): Add autoload cookie;
+ scan latest NoCeM messages instead of old ones.
+ (gnus-nocem-check-article): Fix regexps so as to match to PGP
+ delimiters that are recently used.
+ (gnus-nocem-load-cache): Add autoload cookie.
+
+ * gnus.el (gnus-use-nocem): Enable it to be set to also a number.
+
+ * gnus-start.el (gnus-setup-news): Scan NoCeM messages if a group
+ level which is larger than gnus-use-nocem is specified.
+
+ * gnus-group.el (gnus-group-get-new-news): Ditto.
+
+2006-03-08 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * gnus-util.el (gnus-tool-bar-update): New function.
+
+ * gnus-group.el (gnus-group-update-tool-bar): New variable.
+ (gnus-group-insert-group-line): Add gnus-tool-bar-update.
+
+ * gnus-topic.el (gnus-topic-prepare-topic): Add gnus-tool-bar-update.
+
+2006-03-08 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * nnmail.el (nnmail-split-it): Invert match-partial-words behavior
+ if optional last element is specified in splits (FIELD VALUE...).
+
+2006-03-06 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * mm-view.el (mm-w3m-cid-retrieve-1): Check carefully whether
+ handle is multipart when calling it recursively.
+ (mm-w3m-cid-retrieve): Display warning if retrieving fails.
+
+2006-03-03 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * mm-util.el (mm-with-unibyte-current-buffer): Change "Emacs 23"
+ to "Emacs 23 (unicode)" in doc string.
+
+ * gnus-sum.el (gnus-summary-set-display-table): Change "Emacs 23" to
+ "Emacs 23 (unicode)" in comment.
+
+2006-03-03 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * mm-decode.el (mm-get-part): Don't use
+ mm-with-unibyte-current-buffer.
+
+ * gnus-sum.el (gnus-summary-set-display-table): Don't nix out
+ characters 160 through 255 in Emacs 23.
+
+2006-03-02 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * mml.el (mml-generate-mime-1): Encode parts other than text/* or
+ message/* containing non-ASCII text properly.
+
+2006-02-28 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * mm-util.el (mm-with-unibyte-current-buffer): Add note.
+
+2006-02-28 Andreas Seltenreich <uwi7(a)rz.uni-karlsruhe.de>
+
+ * nnweb.el (nnweb-gmane-create-mapping): Don't choke on ^M.
+
+2006-02-28 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * nnweb.el (nnweb-type-definition, nnweb-gmane-search): Use new
+ nov.php.
+
+2006-02-28 Andreas Seltenreich <uwi7(a)stud.uni-karlsruhe.de>
+
+ * nnweb.el (nnweb-type-definition, nnweb-gmane-create-mapping)
+ (nnweb-gmane-wash-article, nnweb-gmane-search): Fix Gmane web
+ groups. Kudos to Olly Betts <olly(a)survex.com> for providing NOV
+ output on the server side.
+ (nnweb-google-create-mapping): Update regexps and add some
+ progress indication.
+
+2006-02-28 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * message.el (message-user-fqdn): Remove useless * in doc string.
+
+ * gnus-draft.el (gnus-draft-send): Bind message-signature to avoid
+ unnecessary interaction when sending queued mails. Reported by
+ TAKAHASHI Yoshio <tkh(a)jp.fujitsu.com>.
+
+2006-02-28 Lars Magne Ingebrigtsen <larsi(a)gnus.org>
+
+ * gnus-int.el (gnus-open-server): Respect gnus-batch-mode.
+ Merge of 2006-02-20 change from the trunk.
+
+2006-02-28 Lars Magne Ingebrigtsen <larsi(a)gnus.org>
+
+ * dns.el (query-dns): Protect more against buggy tcp output.
+ Merge of 2006-02-20 change from the trunk.
+
+2006-02-27 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * gnus-sum.el (gnus-sequence-of-unread-articles): Return nil if
+ first or last are nil.
+
+2006-02-24 Simon Josefsson <jas(a)extundo.com>
+
+ * flow-fill.el (fill-flowed): Flow-fill unquoted lines too.
+ Merge of 2005-10-26 change from the trunk.
+
+2006-02-23 Lars Magne Ingebrigtsen <larsi(a)gnus.org>
+
+ * flow-fill.el (fill-flowed): Bind adaptive-fill-mode to nil.
+ Remove space stuffing, and only do quotes that actually start with
+ ">" at the beginning of the lines.
+ Merge of 2005-11-17 and 2004-07-25 from the trunk.
+
+2006-02-23 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * utf7.el (utf7-utf-16-coding-system): Fix comment. utf-16-be is
+ also available in Emacs 21.3.
+
+ * message.el (message-fix-before-sending): Change "Emacs 22" to
+ "Emacs 23 (unicode)" in comment.
+
+ * qp.el (quoted-printable-encode-region): Change "Emacs 22" to
+ "Emacs 23 (unicode)" in comment.
+
+ * mm-util.el: Change "Emacs 22" to "Emacs 23 (unicode)" in
+ comment.
+ (mm-coding-system-p): Add comment about no-MULE XEmacs.
+
+ * mm-view.el (mm-fill-flowed): Add :version.
+
+2006-02-23 Ralf Angeli <angeli(a)iwi.uni-sb.de>
+
+ * mm-view.el (mm-fill-flowed): New variable.
+ (mm-inline-text): Use it.
+
+2006-02-21 Wolfram Fenske <wolfram.fenske(a)student.uni-magdeburg.de>
+ (tiny change)
+
+ * nnimap.el (nnimap-request-move-article): Change folder back to
+ source group before deleting.
+
+2006-02-20 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * rfc2047.el (rfc2047-charset-to-coding-system): Don't check the
+ coding system which mm-charset-to-coding-system returns for a
+ given charset is valid.
+
+2006-02-16 Juanma Barranquero <lekktu(a)gmail.com>
+
+ * html2text.el (html2text-remove-tag-list):
+ * spam-stat.el (spam-stat-buffer-words): Fix typo in docstring.
+
+2006-02-14 Chong Yidong <cyd(a)stupidchicken.com>
+
+ * gnus-cus.el: Revert 2005-10-17 change.
+
+2006-02-17 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * gnus-art.el (article-strip-banner): Call
+ article-really-strip-banner only when the regexp match is made.
+
+2006-02-16 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * gnus-art.el (article-strip-banner): Use
+ gnus-extract-address-components instead of
+ mail-header-parse-addresses to make it work with non-ASCII text.
+
+ * rfc2231.el (rfc2231-parse-string): Attempt to parse parameter
+ values which are surrounded with \"...\"; make it never cause a
+ Lisp error; give up parsing of parameters if it failed in
+ extracting type.
+
+2006-02-15 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * mm-util.el (mm-make-temp-file): Import the Emacs 22 version of
+ make-temp-file; make it work with Emacs 20 and XEmacs as well.
+
+ * mm-decode.el (mm-display-external): Use the 3rd arg of
+ mm-make-temp-file.
+ (mm-create-image-xemacs): Ditto.
+
+2006-02-14 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * gnus-draft.el (gnus-draft-send): Replace message-narrow-to-head
+ with message-narrow-to-headers.
+ (gnus-draft-setup): Narrow to header to run message-fetch-field.
+ (gnus-draft-check-draft-articles): New function.
+ (gnus-draft-edit-message, gnus-draft-send-message): Use it.
+
+2006-02-13 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * nnoo.el (nnoo-declare): Don't generate duplicate entries when
+ re-loading nn* modules.
+
+2006-02-10 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * gnus.el: Remove bogus comment.
+
+2006-02-09 Daiki Ueno <ueno(a)unixuser.org>
+
+ * pgg-gpg.el (pgg-gpg-encrypt-region): Don't convert line-endings
+ in elisp.
+ (pgg-gpg-encrypt-symmetric-region): Ditto.
+ (pgg-gpg-sign-region): Ditto.
+
+ * pgg-def.el (pgg-text-mode): New variable.
+
+ * mml2015.el (mml2015-pgg-sign): Enable pgg-text-mode.
+ (mml2015-pgg-encrypt): Ditto.
+
+ * mml1991.el (mml1991-pgg-sign): Enable pgg-text-mode.
+ (mml1991-pgg-encrypt): Ditto.
+
+2006-02-08 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * nnfolder.el (nnfolder-insert-newsgroup-line): Use
+ message-make-date instead of current-time-string.
+
+ * mm-view.el (mm-inline-message): Don't set gnus-newsgroup-charset
+ to gnus-decoded which mm-uu might set.
+
+2006-02-08 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * rfc2231.el (rfc2231-parse-string): Sort segmented parameters;
+ don't decode quoted parameters; remove misimported Emacs code.
+ Suggested by ARISAWA Akihiro <ari(a)mbf.ocn.ne.jp>.
+ (rfc2231-decode-encoded-string): Don't use split-string which
+ behaves differently according to Emacs version; use
+ mm-decode-coding-region to convert charset to coding-system.
+ Suggested by ARISAWA Akihiro <ari(a)mbf.ocn.ne.jp>.
+ (rfc2231-encode-string): Remove misimported Emacs code.
+
+2006-02-07 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * gnus-art.el (article-decode-charset): Don't use ignore-errors
+ when calling mail-header-parse-content-type.
+ (article-de-quoted-unreadable): Ditto.
+ (article-de-base64-unreadable): Ditto.
+ (article-wash-html): Ditto.
+
+ * mm-decode.el (mm-dissect-buffer): Don't use ignore-errors when
+ calling mail-header-parse-content-type and
+ mail-header-parse-content-disposition.
+ (mm-find-raw-part-by-type): Don't use ignore-errors when calling
+ mail-header-parse-content-type.
+
+ * mml.el (mml-insert-mime-headers): Use mml-insert-parameter to
+ insert charset and format parameters; encode description after
+ inserting it to buffer.
+ (mml-insert-parameter): Fold lines properly even if a parameter is
+ segmented into two or more lines; change the max column to 76.
+
+ * rfc1843.el (rfc1843-decode-article-body): Don't use
+ ignore-errors when calling mail-header-parse-content-type.
+
+ * rfc2231.el (rfc2231-parse-string): Return at least type if
+ possible; don't cause an error even if it fails in parsing of
+ parameters. Suggested by ARISAWA Akihiro <ari(a)mbf.ocn.ne.jp>.
+ (rfc2231-encode-string): Don't break lines at the beginning, leave
+ it to mml-insert-parameter.
+
+ * webmail.el (webmail-yahoo-article): Don't use ignore-errors when
+ calling mail-header-parse-content-type.
+
+2006-02-06 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * spam-report.el (spam-report-gmane-use-article-number): Improve
+ doc string.
+ (spam-report-gmane-internal): Check if a suitable header was found
+ in the article.
+
+2006-02-04 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * rfc2231.el (rfc2231-parse-string): Revert 2006-02-03 change.
+ (rfc2231-encode-string): Make param*=value always begin with LWSP.
+
+2006-02-05 Romain Francoise <romain(a)orebokech.com>
+
+ Update copyright notices of all files in the gnus directory.
+
+2006-02-03 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * gnus-util.el (gnus-error): Describe `args'.
+
+2006-02-03 Andreas Seltenreich <uwi7(a)stud.uni-karlsruhe.de>
+
+ * nnweb.el (nnweb-request-group): Avoid growing overview files.
+
+2006-02-03 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * rfc2231.el (rfc2231-parse-string): Add missing semicolons to
+ segmented lines of parameter value to cope with Thunderbird 1.5
+ bug (cf.
https://bugzilla.mozilla.org/show_bug.cgi?id=323318).
+ Suggested by ARISAWA Akihiro <ari(a)mbf.ocn.ne.jp>.
+ (rfc2231-encode-string): Don't make lines exceeding 76 column.
+
+2006-02-01 Max Froumentin <max(a)lapin-bleu.net> (tiny change)
+
+ * mml.el (mml-generate-mime-1): Correct the order of inline signed
+ parts.
+
+2006-01-31 Andreas Seltenreich <uwi7(a)stud.uni-karlsruhe.de>
+
+ * nnweb.el (nnweb-group-alist): Use defvar instead of defvoo,
+ there's only one active file for all servers.
+ (nnweb-request-scan): Make sure nnweb-articles is initialized on
+ solid groups. Gnus might have used a FAST request to select the
+ group.
+ (nnweb-request-group, nnweb-google-parse-1): Don't keep nnweb-type
+ and nnweb-search redundantly in the active file.
+ (nnweb-request-list): Don't list bogus groups. There can only be
+ one.
+ (nnweb-request-create-group): Don't use ARGS.
+ (nnweb-possibly-change-server, nnweb-request-group): Remove some
+ initialisations. Let nnoo do the work.
+
+2006-01-31 Romain Francoise <romain(a)orebokech.com>
+
+ * message.el (message-alternative-emails): Improve docstring.
+ (message-setup-1): Call `message-use-alternative-email-as-from'
+ after `message-setup-hook' to give it precedence over posting
+ styles, etc.
+ (message-use-alternative-email-as-from): Add docstring. Remove
+ the original From header if present.
+
+2006-01-31 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * mm-uu.el (mm-uu-emacs-sources-extract): Say the part has been
+ decoded.
+ (mm-uu-diff-extract): Ditto.
+
+2006-01-31 Kevin Ryde <user42(a)zip.com.au>
+
+ * mailcap.el (mailcap-viewer-passes-test): Don't put "(nil t)" into
+ mailcap-viewer-test-cache when there's no 'test clause, since that
+ will invert the meaning of a "nil" test previously determined by
+ mailcap-mailcap-entry-passes-test.
+
+2006-01-30 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * nnweb.el (nnweb-google-parse-1): Clarify some comments.
+
+2006-01-30 Andreas Seltenreich <uwi7(a)stud.uni-karlsruhe.de>
+
+ * nnweb.el (nnweb-type-definition, nnweb-google-parse-1)
+ (nnweb-google-create-mapping, nnweb-google-search): Adapt to
+ current Google Groups.
+
+2006-01-26 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * Makefile.in (clean): New rule.
+ (distclean): Use it.
+
+2006-01-25 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * mm-uu.el (mm-uu-dissect-text-parts): Ignore it if a given part
+ is dissected into a single part of which the type is the same as
+ the given one; decode charset.
+
+2006-01-21 Kevin Ryde <user42(a)zip.com.au>
+
+ * mailcap.el (mailcap-parse-mailcap-extras): "test" key must go
+ into alists as symbol not string, since that's what
+ mailcap-viewer-passes-test and mailcap-mailcap-entry-passes-test
+ look for.
+
+2006-01-24 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * mm-uu.el (mm-uu-dissect-text-parts): Reduce the number of
+ recursive calls.
+
+2006-01-24 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * mm-view.el (mm-w3m-standalone-supports-m17n-p): New variable.
+ (mm-w3m-standalone-supports-m17n-p): New function.
+ (mm-inline-text-html-render-with-w3m-standalone): Use it to alter
+ w3m usage.
+
+ * gnus-art.el (gnus-article-wash-html-with-w3m-standalone): Use
+ mm-w3m-standalone-supports-m17n-p to alter w3m usage.
+
+2006-01-23 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * mm-uu.el (mm-uu-dissect-text-parts): Decode content transfer
+ encoding.
+
+2006-01-20 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * mml.el (mml-attach-file): Describe `description' in doc string.
+ (mml-menu): Add Emacs MIME manual and PGG manual.
+
+2006-01-19 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * spam.el (spam-group-ham-mark-p, spam-group-spam-mark-p)
+ (spam-group-spam-marks, spam-list-articles, spam-group-ham-marks):
+ Revert 2006-01-08 change because the functions will be used in No
+ Gnus.
+
+2006-01-19 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * mm-bodies.el (mm-decode-body): Don't decode decoded body.
+
+ * mm-uu.el (mm-uu-dissect-text-parts): Dissect dissected parts.
+
+2006-01-17 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * mm-decode.el (mm-inlined-types): Add application/pgp.
+ (mm-automatic-display): Ditto.
+
+ * mm-uu.el (mm-uu-dissect-text-parts): Recognize application/pgp
+ part as text.
+
+2006-01-16 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * nnrss.el: Update copyright.
+ (nnrss-opml-import): Query whether to subscribe to each entry.
+
+ * gnus-art.el:
+ * gnus-cus.el:
+ * gnus-group.el:
+ * gnus-start.el:
+ * gnus-sum.el:
+ * gnus-xmas.el:
+ * messagexmas.el:
+ * mm-uu.el:
+ * mm-view.el: Update copyright.
+
+2006-01-16 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * message.el (message-info): New function.
+ (message-mode-menu): Add it.
+ Update copyright.
+
+ * ChangeLog: Fix and update copyright.
+
+2006-01-16 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * mm-uu.el (mm-uu-text-plain-type): New variable.
+ (mm-uu-pgp-signed-extract-1): Use it.
+ (mm-uu-pgp-encrypted-extract-1): Use it.
+ (mm-uu-dissect): Use it; allow two optional arguments; one is a
+ flag specifying whether there's no message header; the other is
+ for a MIME type and parameters; bind mm-uu-text-plain-type with
+ the later one.
+ (mm-uu-dissect-text-parts): New function.
+
+ * gnus-art.el (gnus-display-mime): Use mm-uu-dissect-text-parts to
+ dissect text parts.
+
+2006-01-13 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * gnus-art.el (article-wash-html): Use
+ gnus-summary-show-article-charset-alist if a numeric arg is given.
+ (gnus-article-wash-html-with-w3m-standalone): New function.
+
+ * mm-view.el (mm-text-html-renderer-alist): Map w3m-standalone to
+ mm-inline-text-html-render-with-w3m-standalone.
+ (mm-text-html-washer-alist): Map w3m-standalone to
+ gnus-article-wash-html-with-w3m-standalone.
+ (mm-inline-text-html-render-with-w3m-standalone): New function.
+
+2006-01-10 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * nnrss.el (nnrss-wash-html-in-text-plain-parts): New variable.
+ (nnrss-request-article): Render text/plain parts as HTML.
+
+ * gnus-art.el (gnus-article-wash-html-with-w3m): No need to narrow
+ the buffer.
+
+2006-01-08 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * gnus-cus.el (gnus-group-parameters): Sync posting-style with
+ custom definition of `gnus-posting-styles'.
+
+ * gnus-start.el (gnus-gnus-to-quick-newsrc-format): Bind
+ print-circle. Suggested by Kalle Olavi Niemitalo <kon(a)iki.fi>.
+
+2006-01-05 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * gnus-group.el (gnus-useful-groups): Use Gmane for ding.
+ Use nntp for bug archive.
+
+2006-01-05 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * nnrss.el (nnrss-request-article): Fix the way to fill text/plain
+ parts.
+ (nnrss-normalize-date): New function converts ISO 8601 date into
+ RFC822 style. Suggested by Mark Plaksin <happy(a)mcplaksin.org>.
+ (nnrss-check-group): Use it.
+
+2006-01-03 Rodrigo Ventura <yoda(a)isr.ist.utl.pt> (tiny change)
+
+ * gnus-xmas.el (gnus-xmas-group-startup-message): Typo
gnus-splash-face -> gnus-splash. Fixes starting from a TTY in
- XEmacs.
- From Rodrigo Ventura <yoda(a)isr.ist.utl.pt>
+ XEmacs.
2006-01-01 Katsumi Yamaoka <yamaoka(a)jpl.org>
@@ -34,7 +552,7 @@
* gnus-msg.el (gnus-copy-article-buffer): Remove MIME buttons
associated with multipart/alternative parts.
-2005-12-19 Mark Plaksin <happy(a)mcplaksin.org> (tiny change)
+2005-12-19 Mark Plaksin <happy(a)mcplaksin.org> (tiny change)
* nnrss.el (nnrss-check-group): Put the RSS dc:subject in the
article.
@@ -44,6 +562,13 @@
* dns.el (query-dns): Make sure we check the buffer size before
removing tcp headers.
+2006-01-08 Chong Yidong <cyd(a)stupidchicken.com>
+
+ * spam.el (spam-group-ham-mark-p, spam-group-spam-mark-p)
+ (spam-group-spam-marks): Delete functions.
+ (spam-list-articles): Just call spam-group-ham-marks directly.
+ (spam-group-ham-marks): Simplify.
+
2005-12-16 Katsumi Yamaoka <yamaoka(a)jpl.org>
* gnus-art.el (gnus-signature-separator): Fix custom type.
@@ -99,8 +624,12 @@
string.
2005-12-09 ARISAWA Akihiro <ari(a)mbf.ocn.ne.jp> (tiny change)
+
+ * mm-decode.el (mm-display-external): Add missing cdr.
+
+2005-12-12 Richard M. Stallman <rms(a)gnu.org>
- * mm-decode.el (mm-display-external): Add lacked cdr.
+ * mm-url.el (mm-url-load-url): Require url-parse and url-vars.
2005-12-08 Reiner Steib <Reiner.Steib(a)gmx.de>
@@ -166,7 +695,7 @@
* nnmail.el (nnmail-fancy-expiry-target): Protect against invalid
date header.
-2005-11-16 Boris Samorodov <bsam(a)ipt.ru> (tiny patch)
+2005-11-16 Boris Samorodov <bsam(a)ipt.ru> (tiny patch)
* imap.el (imap-kerberos4-open): Ignore SSL stuff.
@@ -207,7 +736,7 @@
error.
(nntp-retrieve-data): Rethrow new error condition to break out of
recursive call to nntp-send-authinfo.
-
+
2005-11-13 Katsumi Yamaoka <yamaoka(a)jpl.org>
* gnus-start.el (gnus-dribble-read-file): Use make-local-variable
@@ -284,7 +813,7 @@
(pgg-decrypt): Convey provided passphrase in subordinate call to
pgg-decrypt-region.
-2005-10-20 Ken Manheimer <ken.manheimer+emacs(a)gmail.com>
+2005-10-20 Ken Manheimer <ken.manheimer+emacs(a)gmail.com>
* pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
(pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
@@ -371,8 +900,8 @@
(message-insert-courtesy-copy, message-fill-address)
(message-fill-header, message-shorten-references)
(message-setup-1, message-cancel-news)
- (message-forward-make-body-plain) (message-forward-make-body-mime)
- (message-forward-make-body-mml) (message-encode-message-body)
+ (message-forward-make-body-plain, message-forward-make-body-mime)
+ (message-forward-make-body-mml, message-encode-message-body)
(message-forward-make-body-digest-plain)
(message-forward-make-body-digest-mime)
(message-use-alternative-email-as-from): Insert `hard-newline'
@@ -404,7 +933,7 @@
whitespace removed in revision 7.8. Use concatenated string to
protect trailing whitespace.
-2005-10-27 Jouni K Seppanen <jks(a)iki.fi> (tiny change)
+2005-10-27 Jouni K Seppanen <jks(a)iki.fi> (tiny change)
* nnimap.el (nnimap-search-uids-not-since-is-evil): Add variable.
(nnimap-request-expire-articles): Use it to avoid sending 'UID
@@ -489,11 +1018,11 @@
* message.el (message-expand-group): Pass the common
prefix substring of completion to `display-completion-list'.
-2005-10-09 Daniel Brockman <daniel(a)brockman.se>
+2005-10-09 Daniel Brockman <daniel(a)brockman.se>
* format-spec.el (format-spec): Propagate text properties of % spec.
-2005-01-21 Derek Atkins <warlord(a)MIT.EDU> (tiny change)
+2005-01-21 Derek Atkins <warlord(a)MIT.EDU> (tiny change)
* pgg-pgp.el (pgg-pgp-decrypt-region): Use passphrase cache.
@@ -502,10 +1031,9 @@
* pgg-parse.el (top-level): Don't require custom, it is
autoloaded. (To sync with No Gnus.)
-2005-05-09 Simon Josefsson <jas(a)extundo.com>
+2005-05-09 Georg C. F. Greve <greve(a)gnu.org> (tiny change)
- * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching,
- tiny patch from "Georg C. F. Greve" <greve(a)gnu.org>.
+ * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching.
2005-10-08 Simon Josefsson <jas(a)extundo.com>
@@ -964,7 +1492,7 @@
* gnus-topic.el (gnus-topic-mode): Ditto.
-2005-07-08 Ralf Angeli <angeli(a)iwi.uni-sb.de> (tiny change)
+2005-07-08 Ralf Angeli <angeli(a)iwi.uni-sb.de>
* gnus-art.el (gnus-article-next-page, gnus-article-next-page-1)
(gnus-article-prev-page): Take scroll-margin into consideration.
@@ -1810,11 +2338,11 @@
* nnimap.el (nnimap-retrieve-headers-from-server): Fix last change.
-2005-03-10 Arne J,Ax(Brgensen <arne(a)arnested.dk> (tiny change)
+2005-03-10 Arne J,Ax(Brgensen <arne(a)arnested.dk> (tiny change)
* nnimap.el (nnimap-retrieve-headers-from-server): Fix off-by-one flaw.
-2005-03-08 Bjorn Solberg <bjorn_ding(a)hekneby.org> (tiny change)
+2005-03-08 Bjorn Solberg <bjorn_ding(a)hekneby.org> (tiny change)
* nnimap.el (nnimap-retrieve-headers-from-server): Sort NOV
buffer (since IMAP server might return FETCH response out of
@@ -2270,11 +2798,13 @@
* deuglify.el (gnus-outlook-deuglify): Add :version.
- * html2text.el: Beautify code. Improve doc strings. Some checkdoc
- cleanup.
+ * html2text.el: Beautify code. Improve doc strings. Some
+ checkdoc cleanup.
(html2text-get-attr, html2text-fix-paragraph): Simplify code.
- (html2text-format-tag-list): Add "strong" and "em".
- From "Alfred M. Szmidt" <ams(a)kemisten.nu> (tiny change).
+
+2004-11-01 Alfred M. Szmidt <ams(a)kemisten.nu> (tiny change)
+
+ * html2text.el (html2text-format-tag-list): Add "strong" and "em".
2004-10-29 Katsumi Yamaoka <yamaoka(a)jpl.org>
@@ -2390,7 +2920,7 @@
* legacy-gnus-agent.el
(gnus-agent-convert-to-compressed-agentview-prompt):
- New function. Used internally to only display 'gnus converting
+ New function. Used internally to only display 'gnus converting
files' message when actually necessary.
* gnus-sum.el: Remove (require 'gnus-agent) as required
@@ -2407,7 +2937,7 @@
(gnus-agent-unfetch-articles): New function.
(gnus-agent-fetch-headers): Use gnus-agent-braid-nov to validate
article numbers even when local .overview file is missing.
- (gnus-agent-read-article-number): New function. Only accepts
+ (gnus-agent-read-article-number): New function. Only accepts
27-bit article numbers.
(gnus-agent-copy-nov-line, gnus-agent-uncached-articles):
Use gnus-agent-read-article-number.
@@ -2503,12 +3033,12 @@
* gnus-agent.el (gnus-agent-read-agentview): Add a missing arg to
error.
-2004-10-18 Kevin Greiner <kevin.greiner(a)compsol.cc>
+2004-10-18 Kevin Greiner <kevin.greiner(a)compsol.cc>
* gnus-start.el (gnus-convert-old-newsrc): Only write the conversion
message to newsrc-dribble when an actual conversion is performed.
-2004-10-18 Kevin Greiner <kevin.greiner(a)compsol.cc>
+2004-10-18 Kevin Greiner <kevin.greiner(a)compsol.cc>
* gnus-agent.el (gnus-agent-read-local):
Bind nnheader-file-coding-system to gnus-agent-file-coding-system to
@@ -2517,9 +3047,9 @@
coding-system-for-write, as the with-temp-file macro first prints
to a buffer then saves the buffer.
-2004-10-18 Kevin Greiner <kgreiner(a)xpediantsolutions.com>
+2004-10-18 Kevin Greiner <kgreiner(a)xpediantsolutions.com>
- * legacy-gnus-agent.el (): New. Provides converters that are only
+ * legacy-gnus-agent.el (): New. Provides converters that are only
loaded when gnus-convert-old-newsrc needs to call them.
* gnus-agent.el (gnus-agent-read-agentview): Remove support for
@@ -2537,7 +3067,7 @@
should be protected from potentially irreversable changes by the
function.
-2004-10-18 Kevin Greiner <kgreiner(a)xpediantsolutions.com>
+2004-10-18 Kevin Greiner <kgreiner(a)xpediantsolutions.com>
* gnus-int.el (gnus-request-accept-article): Inform the agent that
articles are being added to a group.
@@ -2550,7 +3080,7 @@
(gnus-agent-regenerate-group): The REREAD parameter can now be a
list of articles that will be marked as unread.
-2004-10-18 Kevin Greiner <kevin.greiner(a)compsol.cc>
+2004-10-18 Kevin Greiner <kevin.greiner(a)compsol.cc>
* gnus-range.el (gnus-sorted-range-intersection): Now accepts
single-interval range of the form (min . max). Previously the
@@ -2562,18 +3092,18 @@
* gnus-sum.el (gnus-summary-highlight-line): Articles stored in
the cache, but not the agent, now appear with their usual face.
-2004-10-18 Kevin Greiner <kevin.greiner(a)compsol.cc>
+2004-10-18 Kevin Greiner <kevin.greiner(a)compsol.cc>
* gnus-sum.el (gnus-adjust-marks): Now correctly handles a list of
marks consisting of a single range {for example, (3 . 5)} rather
than a list of a single range { ((3 . 5)) }.
-2004-10-18 Kevin Greiner <kevin.greiner(a)compsol.cc>
+2004-10-18 Kevin Greiner <kevin.greiner(a)compsol.cc>
* gnus-sum.el (gnus-adjust-marks): Avoid splicing null INTO the
uncompressed list.
-2004-10-18 Kevin Greiner <kevin.greiner(a)compsol.cc>
+2004-10-18 Kevin Greiner <kevin.greiner(a)compsol.cc>
* gnus-draft.el (gnus-group-send-queue): Pass the group name
"nndraft:queue" along to gnus-draft-send.
@@ -3152,21 +3682,18 @@
* nnimap.el (nnimap-authinfo-file, nnimap-prune-cache):
Add :group 'nnimap.
-2004-08-30 Simon Josefsson <jas(a)extundo.com>
+2004-08-30 Andreas Schwab <schwab(a)suse.de>
* rfc2231.el (rfc2231-parse-string): Restore whitespace syntax for
- ?* and ?\; (tiny patch). From Andreas Schwab <schwab(a)suse.de>.
+ ?* and ?\;.
-2004-08-30 Simon Josefsson <jas(a)extundo.com>
-
- * ietf-drums.el (ietf-drums-syntax-table): Set syntax of ?* ?\;
- and ?\' to symbol instead of whitespace (tiny patch).
- From Andreas Schwab <schwab(a)suse.de>.
+2004-08-30 Andreas Schwab <schwab(a)suse.de>
-2004-08-30 Simon Josefsson <jas(a)extundo.com>
+ * rfc2231.el (rfc2231-parse-string): Restore whitespace syntax for
+ ?* and ?\;.
- * message.el, gnus-art.el: Sync IDNA fixes against HEAD, include
- entries until 2004-08-30 below.
+ * ietf-drums.el (ietf-drums-syntax-table): Set syntax of ?* ?\;
+ and ?\' to symbol instead of whitespace.
2004-06-23 Jesper Harder <harder(a)ifa.au.dk>
@@ -3369,7 +3896,7 @@
* gnus-msg.el (gnus-summary-followup-with-original):
Document yanking of region when active.
-2004-04-13 Kevin Greiner <kgreiner(a)xpediantsolutions.com>
+2004-04-13 Kevin Greiner <kgreiner(a)xpediantsolutions.com>
* gnus-agent.el: Merged 7.3 through 7.7 updates into branch.
Revision 7.2 changes excluded to maintain compatibility with all
@@ -3380,7 +3907,7 @@
See ChangeLog.2 for earlier changes.
- Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/binhex.el
Index: binhex.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/binhex.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- binhex.el 2005/11/15 03:45:41 1.4
+++ binhex.el 2006/03/16 04:17:41 1.5
@@ -1,7 +1,7 @@
;;; binhex.el --- elisp native binhex decode
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh(a)cs.rochester.edu>
;; Keywords: binhex news
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/canlock.el
Index: canlock.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/canlock.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- canlock.el 2005/11/15 03:45:42 1.5
+++ canlock.el 2006/03/16 04:17:42 1.6
@@ -1,7 +1,7 @@
;;; canlock.el --- functions for Cancel-Lock feature
;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Katsumi Yamaoka <yamaoka(a)jpl.org>
;; Keywords: news, cancel-lock, hmac, sha1, rfc2104
1.4 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/compface.el
Index: compface.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/compface.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- compface.el 2005/11/15 03:45:42 1.3
+++ compface.el 2006/03/16 04:17:42 1.4
@@ -1,6 +1,6 @@
;;; compface.el --- functions for converting X-Face headers
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/deuglify.el
Index: deuglify.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/deuglify.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- deuglify.el 2005/11/15 03:45:42 1.5
+++ deuglify.el 2006/03/16 04:17:42 1.6
@@ -1,6 +1,6 @@
;;; deuglify.el --- deuglify broken Outlook (Express) articles
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Copyright (C) 2001, 2002 Raymond Scholz
;; Author: Raymond Scholz <rscholz(a)zonix.de>
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/earcon.el
Index: earcon.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/earcon.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- earcon.el 2005/11/15 03:45:42 1.4
+++ earcon.el 2006/03/16 04:17:42 1.5
@@ -1,7 +1,7 @@
;;; earcon.el --- Sound effects for messages
;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Steven L. Baur <steve(a)miranova.com>
1.7 +8 -2 XEmacs/packages/xemacs-packages/gnus/lisp/flow-fill.el
Index: flow-fill.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/flow-fill.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- flow-fill.el 2005/11/15 03:45:42 1.6
+++ flow-fill.el 2006/03/16 04:17:42 1.7
@@ -1,7 +1,7 @@
;;; flow-fill.el --- interpret RFC2646 "flowed" text
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <jas(a)pdc.kth.se>
;; Keywords: mail
@@ -113,6 +113,11 @@ RFC 2646 suggests 66 characters for read
(save-excursion
(set-buffer (or (current-buffer) buffer))
(goto-char (point-min))
+ ;; Remove space stuffing.
+ (while (re-search-forward "^ " nil t)
+ (delete-char -1)
+ (forward-line 1))
+ (goto-char (point-min))
(while (re-search-forward " $" nil t)
(when (save-excursion
(beginning-of-line)
@@ -146,7 +151,8 @@ RFC 2646 suggests 66 characters for read
(condition-case nil
(let ((fill-prefix (when quote (concat quote " ")))
(fill-column (eval fill-flowed-display-column))
- filladapt-mode)
+ filladapt-mode
+ adaptive-fill-mode)
(fill-region (fill-flowed-point-at-bol)
(min (1+ (fill-flowed-point-at-eol))
(point-max))
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/format-spec.el
Index: format-spec.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/format-spec.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- format-spec.el 2005/11/15 03:45:43 1.4
+++ format-spec.el 2006/03/16 04:17:43 1.5
@@ -1,7 +1,7 @@
;;; format-spec.el --- functions for formatting arbitrary formatting strings
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: tools
1.10 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-agent.el
Index: gnus-agent.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-agent.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gnus-agent.el 2005/12/19 13:35:24 1.9
+++ gnus-agent.el 2006/03/16 04:17:43 1.10
@@ -1,7 +1,7 @@
;;; gnus-agent.el --- unplugged support for Gnus
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; This file is part of GNU Emacs.
1.10 +127 -94 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-art.el
Index: gnus-art.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-art.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gnus-art.el 2006/01/04 07:05:29 1.9
+++ gnus-art.el 2006/03/16 04:17:43 1.10
@@ -1,7 +1,7 @@
;;; gnus-art.el --- article mode commands for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
@@ -2267,38 +2267,37 @@ If PROMPT (the prefix), prompt for a cod
(error))
gnus-newsgroup-ignored-charsets))
ct cte ctl charset format)
- (save-excursion
- (save-restriction
- (article-narrow-to-head)
- (setq ct (message-fetch-field "Content-Type" t)
- cte (message-fetch-field "Content-Transfer-Encoding" t)
- ctl (and ct (ignore-errors
- (mail-header-parse-content-type ct)))
- charset (cond
- (prompt
- (mm-read-coding-system "Charset to decode: "))
- (ctl
- (mail-content-type-get ctl 'charset)))
- format (and ctl (mail-content-type-get ctl 'format)))
- (when cte
- (setq cte (mail-header-strip cte)))
- (if (and ctl (not (string-match "/" (car ctl))))
- (setq ctl nil))
- (goto-char (point-max)))
- (forward-line 1)
- (save-restriction
- (narrow-to-region (point) (point-max))
- (when (and (eq mail-parse-charset 'gnus-decoded)
- (eq (mm-body-7-or-8) '8bit))
- ;; The text code could have been decoded.
- (setq charset mail-parse-charset))
- (when (and (or (not ctl)
- (equal (car ctl) "text/plain"))
- (not format)) ;; article with format will decode later.
- (mm-decode-body
- charset (and cte (intern (downcase
- (gnus-strip-whitespace cte))))
- (car ctl)))))))
+ (save-excursion
+ (save-restriction
+ (article-narrow-to-head)
+ (setq ct (message-fetch-field "Content-Type" t)
+ cte (message-fetch-field "Content-Transfer-Encoding" t)
+ ctl (and ct (mail-header-parse-content-type ct))
+ charset (cond
+ (prompt
+ (mm-read-coding-system "Charset to decode: "))
+ (ctl
+ (mail-content-type-get ctl 'charset)))
+ format (and ctl (mail-content-type-get ctl 'format)))
+ (when cte
+ (setq cte (mail-header-strip cte)))
+ (if (and ctl (not (string-match "/" (car ctl))))
+ (setq ctl nil))
+ (goto-char (point-max)))
+ (forward-line 1)
+ (save-restriction
+ (narrow-to-region (point) (point-max))
+ (when (and (eq mail-parse-charset 'gnus-decoded)
+ (eq (mm-body-7-or-8) '8bit))
+ ;; The text code could have been decoded.
+ (setq charset mail-parse-charset))
+ (when (and (or (not ctl)
+ (equal (car ctl) "text/plain"))
+ (not format)) ;; article with format will decode later.
+ (mm-decode-body
+ charset (and cte (intern (downcase
+ (gnus-strip-whitespace cte))))
+ (car ctl)))))))
(defun article-decode-encoded-words ()
"Remove encoded-word encoding from headers."
@@ -2390,9 +2389,7 @@ If READ-CHARSET, ask for a coding system
(setq type
(gnus-fetch-field "content-transfer-encoding"))
(let* ((ct (gnus-fetch-field "content-type"))
- (ctl (and ct
- (ignore-errors
- (mail-header-parse-content-type ct)))))
+ (ctl (and ct (mail-header-parse-content-type ct))))
(setq charset (and ctl
(mail-content-type-get ctl 'charset)))
(if (stringp charset)
@@ -2420,9 +2417,7 @@ If READ-CHARSET, ask for a coding system
(setq type
(gnus-fetch-field "content-transfer-encoding"))
(let* ((ct (gnus-fetch-field "content-type"))
- (ctl (and ct
- (ignore-errors
- (mail-header-parse-content-type ct)))))
+ (ctl (and ct (mail-header-parse-content-type ct))))
(setq charset (and ctl
(mail-content-type-get ctl 'charset)))
(if (stringp charset)
@@ -2467,25 +2462,34 @@ If READ-CHARSET, ask for a coding system
(defun article-wash-html (&optional read-charset)
"Format an HTML article.
-If READ-CHARSET, ask for a coding system."
+If READ-CHARSET, ask for a coding system. If it is a number, the
+charset defined in `gnus-summary-show-article-charset-alist' is used."
(interactive "P")
(save-excursion
(let ((inhibit-read-only t)
charset)
- (when (gnus-buffer-live-p gnus-original-article-buffer)
- (with-current-buffer gnus-original-article-buffer
- (let* ((ct (gnus-fetch-field "content-type"))
- (ctl (and ct
- (ignore-errors
- (mail-header-parse-content-type ct)))))
- (setq charset (and ctl
- (mail-content-type-get ctl 'charset)))
- (when (stringp charset)
- (setq charset (intern (downcase charset)))))))
- (when read-charset
- (setq charset (mm-read-coding-system "Charset: " charset)))
- (unless charset
- (setq charset gnus-newsgroup-charset))
+ (if read-charset
+ (if (or (and (numberp read-charset)
+ (setq charset
+ (cdr
+ (assq read-charset
+ gnus-summary-show-article-charset-alist))))
+ (setq charset (mm-read-coding-system "Charset: ")))
+ (let ((gnus-summary-show-article-charset-alist
+ (list (cons 1 charset))))
+ (with-current-buffer gnus-summary-buffer
+ (gnus-summary-show-article 1)))
+ (error "No charset is given"))
+ (when (gnus-buffer-live-p gnus-original-article-buffer)
+ (with-current-buffer gnus-original-article-buffer
+ (let* ((ct (gnus-fetch-field "content-type"))
+ (ctl (and ct (mail-header-parse-content-type ct))))
+ (setq charset (and ctl
+ (mail-content-type-get ctl 'charset)))
+ (when (stringp charset)
+ (setq charset (intern (downcase charset)))))))
+ (unless charset
+ (setq charset gnus-newsgroup-charset)))
(article-goto-body)
(save-window-excursion
(save-restriction
@@ -2514,19 +2518,34 @@ If READ-CHARSET, ask for a coding system
(defun gnus-article-wash-html-with-w3m ()
"Wash the current buffer with emacs-w3m."
(mm-setup-w3m)
- (save-restriction
- (narrow-to-region (point) (point-max))
- (let ((w3m-safe-url-regexp mm-w3m-safe-url-regexp)
- w3m-force-redisplay)
- (w3m-region (point-min) (point-max)))
- (when (and mm-inline-text-html-with-w3m-keymap
- (boundp 'w3m-minor-mode-map)
- w3m-minor-mode-map)
- (add-text-properties
- (point-min) (point-max)
- (list 'keymap w3m-minor-mode-map
- ;; Put the mark meaning this part was rendered by emacs-w3m.
- 'mm-inline-text-html-with-w3m t)))))
+ (let ((w3m-safe-url-regexp mm-w3m-safe-url-regexp)
+ w3m-force-redisplay)
+ (w3m-region (point-min) (point-max)))
+ (when (and mm-inline-text-html-with-w3m-keymap
+ (boundp 'w3m-minor-mode-map)
+ w3m-minor-mode-map)
+ (add-text-properties
+ (point-min) (point-max)
+ (list 'keymap w3m-minor-mode-map
+ ;; Put the mark meaning this part was rendered by emacs-w3m.
+ 'mm-inline-text-html-with-w3m t))))
+
+(eval-when-compile (defvar charset)) ;; Bound by `article-wash-html'.
+
+(defun gnus-article-wash-html-with-w3m-standalone ()
+ "Wash the current buffer with w3m."
+ (if (mm-w3m-standalone-supports-m17n-p)
+ (progn
+ (unless (mm-coding-system-p charset) ;; Bound by `article-wash-html'.
+ ;; The default.
+ (setq charset 'iso-8859-1))
+ (let ((coding-system-for-write charset)
+ (coding-system-for-read charset))
+ (call-process-region
+ (point-min) (point-max)
+ "w3m" t t nil "-dump" "-T" "text/html"
+ "-I" (symbol-name charset) "-O" (symbol-name charset))))
+ (mm-inline-wash-with-stdin nil "w3m" "-dump" "-T"
"text/html")))
(defun article-hide-list-identifiers ()
"Remove list identifies from the Subject header.
@@ -2589,18 +2608,22 @@ always hide."
(article-really-strip-banner
(gnus-parameter-banner gnus-newsgroup-name)))
(when gnus-article-address-banner-alist
- (article-really-strip-banner
- (let ((from (save-restriction
- (widen)
- (article-narrow-to-head)
- (mail-fetch-field "from"))))
- (when (and from
- (setq from
- (caar (mail-header-parse-addresses from))))
- (catch 'found
- (dolist (pair gnus-article-address-banner-alist)
- (when (string-match (car pair) from)
- (throw 'found (cdr pair)))))))))))))
+ ;; Note that the From header is decoded here, so it is
+ ;; required that the *-extract-address-components function
+ ;; supports non-ASCII text.
+ (let ((from (save-restriction
+ (widen)
+ (article-narrow-to-head)
+ (mail-fetch-field "from"))))
+ (when (and from
+ (setq from
+ (cadr (funcall gnus-extract-address-components
+ from))))
+ (catch 'found
+ (dolist (pair gnus-article-address-banner-alist)
+ (when (string-match (car pair) from)
+ (throw 'found
+ (article-really-strip-banner (cdr pair)))))))))))))
(defun article-really-strip-banner (banner)
"Strip the banner specified by the argument."
@@ -4720,11 +4743,15 @@ N is the numerical prefix."
;; We have to do this since selecting the window
;; may change the point. So we set the window point.
(set-window-point window point)))
- (let* ((handles (or ihandles
- (mm-dissect-buffer nil gnus-article-loose-mime)
- (and gnus-article-emulate-mime
- (mm-uu-dissect))))
- (inhibit-read-only t) handle name type b e display)
+ (let ((handles ihandles)
+ (inhibit-read-only t)
+ handle)
+ (cond (handles)
+ ((setq handles (mm-dissect-buffer nil gnus-article-loose-mime))
+ (when gnus-article-emulate-mime
+ (mm-uu-dissect-text-parts handles)))
+ (gnus-article-emulate-mime
+ (setq handles (mm-uu-dissect))))
(when (and (not ihandles)
(not gnus-displaying-mime))
;; Top-level call; we clean up.
@@ -4862,13 +4889,18 @@ If displaying \"text/html\" is discourag
(let ((id (1+ (length gnus-article-mime-handle-alist)))
beg)
(push (cons id handle) gnus-article-mime-handle-alist)
+ (when (and display
+ (equal (mm-handle-media-supertype handle) "message"))
+ (insert-char
+ ?\n
+ (cond ((not (bolp)) 2)
+ ((or (bobp) (eq (char-before (1- (point))) ?\n)) 0)
+ (t 1))))
(when (or (not display)
(not (gnus-unbuttonized-mime-type-p type)))
- ;(gnus-article-insert-newline)
(gnus-insert-mime-button
handle id (list (or display (and not-attachment text))))
(gnus-article-insert-newline)
- ;(gnus-article-insert-newline)
;; Remember modify the number of forward lines.
(setq move t))
(setq beg (point))
@@ -5286,14 +5318,15 @@ not have a face in `gnus-article-boring-
(boundp 'gnus-article-boring-faces)
(symbol-value 'gnus-article-boring-faces))
(save-excursion
- (catch 'only-boring
- (while (re-search-forward "\\b\\w\\w" nil t)
- (forward-char -1)
- (when (not (gnus-intersection
- (gnus-faces-at (point))
- (symbol-value 'gnus-article-boring-faces)))
- (throw 'only-boring nil)))
- (throw 'only-boring t)))))
+ (let ((inhibit-point-motion-hooks t))
+ (catch 'only-boring
+ (while (re-search-forward "\\b\\w\\w" nil t)
+ (forward-char -1)
+ (when (not (gnus-intersection
+ (gnus-faces-at (point))
+ (symbol-value 'gnus-article-boring-faces)))
+ (throw 'only-boring nil)))
+ (throw 'only-boring t))))))
(defun gnus-article-refer-article ()
"Read article specified by message-id around point."
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-async.el
Index: gnus-async.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-async.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnus-async.el 2005/11/15 03:45:43 1.5
+++ gnus-async.el 2006/03/16 04:17:44 1.6
@@ -1,7 +1,7 @@
;;; gnus-async.el --- asynchronous support for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-audio.el
Index: gnus-audio.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-audio.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-audio.el 2005/11/15 03:45:43 1.4
+++ gnus-audio.el 2006/03/16 04:17:44 1.5
@@ -1,7 +1,7 @@
;;; gnus-audio.el --- Sound effects for Gnus
;; Copyright (C) 1996, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Steven L. Baur <steve(a)miranova.com>
;; Keywords: news, mail, multimedia
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-bcklg.el
Index: gnus-bcklg.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-bcklg.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-bcklg.el 2005/11/15 03:45:44 1.4
+++ gnus-bcklg.el 2006/03/16 04:17:44 1.5
@@ -1,7 +1,7 @@
;;; gnus-bcklg.el --- backlog functions for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.8 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-cache.el
Index: gnus-cache.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-cache.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gnus-cache.el 2005/12/19 13:35:24 1.7
+++ gnus-cache.el 2006/03/16 04:17:44 1.8
@@ -1,7 +1,7 @@
;;; gnus-cache.el --- cache interface for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.7 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-cite.el
Index: gnus-cite.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-cite.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnus-cite.el 2005/11/15 03:45:44 1.6
+++ gnus-cite.el 2006/03/16 04:17:44 1.7
@@ -1,7 +1,7 @@
;;; gnus-cite.el --- parse citations in articles for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Per Abhiddenware
1.8 +9 -14 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-cus.el
Index: gnus-cus.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-cus.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gnus-cus.el 2005/11/15 03:45:44 1.7
+++ gnus-cus.el 2006/03/16 04:17:45 1.8
@@ -1,7 +1,7 @@
;;; gnus-cus.el --- customization commands for Gnus
;; Copyright (C) 1996, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Per Abrahamsen <abraham(a)dina.kvl.dk>
;; Keywords: news
@@ -36,14 +36,6 @@
;;; Widgets:
-(defvar gnus-custom-map
- (let ((map (make-keymap)))
- (set-keymap-parent map widget-keymap)
- (suppress-keymap map)
- (define-key map [mouse-1] 'widget-move-and-invoke)
- map)
- "Keymap for editing Gnus customization buffers.")
-
(defun gnus-custom-mode ()
"Major mode for editing Gnus customization buffers.
@@ -59,7 +51,7 @@ if that value is non-nil."
(kill-all-local-variables)
(setq major-mode 'gnus-custom-mode
mode-name "Gnus Customize")
- (use-local-map gnus-custom-map)
+ (use-local-map widget-keymap)
;; Emacs 21 stuff:
(when (and (facep 'custom-button-face)
(facep 'custom-button-pressed-face))
@@ -235,8 +227,11 @@ See `gnus-emphasis-alist'.")
(const signature-file)
(const organization)
(const address)
+ (const x-face-file)
(const name)
- (const body))
+ (const body)
+ (symbol)
+ (string :tag "Header"))
(string :format "%v"))))
"post style.
See `gnus-posting-styles'."))
@@ -487,7 +482,7 @@ form, but who cares?"
(widget-create 'sexp
:tag "Method"
:value (gnus-info-method info))))
- (use-local-map gnus-custom-map)
+ (use-local-map widget-keymap)
(widget-setup)
(buffer-enable-undo)
(goto-char (point-min))))
@@ -881,7 +876,7 @@ articles in the thread.
'(repeat :inline t
:tag "Unknown entries"
sexp)))
- (use-local-map gnus-custom-map)
+ (use-local-map widget-keymap)
(widget-setup)))
(defun gnus-score-customize-done (&rest ignore)
@@ -1058,7 +1053,7 @@ articles in the thread.
(gnus-agent-cat-prepare-category-field agent-enable-undownloaded-faces)
- (use-local-map gnus-custom-map)
+ (use-local-map widget-keymap)
(widget-setup)
(buffer-enable-undo))))
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-delay.el
Index: gnus-delay.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-delay.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnus-delay.el 2005/12/19 13:35:24 1.5
+++ gnus-delay.el 2006/03/16 04:17:45 1.6
@@ -1,6 +1,6 @@
;;; gnus-delay.el --- Delayed posting of articles
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Kai Großjohann <Kai.Grossjohann(a)CS.Uni-Dortmund.DE>
;; Keywords: mail, news, extensions
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-demon.el
Index: gnus-demon.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-demon.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-demon.el 2005/11/15 03:45:44 1.4
+++ gnus-demon.el 2006/03/16 04:17:45 1.5
@@ -1,7 +1,7 @@
;;; gnus-demon.el --- daemonic Gnus behaviour
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-diary.el
Index: gnus-diary.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-diary.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-diary.el 2005/11/15 03:45:45 1.4
+++ gnus-diary.el 2006/03/16 04:17:45 1.5
@@ -1,6 +1,6 @@
;;; gnus-diary.el --- Wrapper around the NNDiary Gnus backend
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Copyright (C) 1999, 2000, 2001 Didier Verna.
;; Author: Didier Verna <didier(a)xemacs.org>
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-dired.el
Index: gnus-dired.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-dired.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-dired.el 2005/11/15 03:45:45 1.4
+++ gnus-dired.el 2006/03/16 04:17:46 1.5
@@ -1,7 +1,7 @@
;;; gnus-dired.el --- utility functions where gnus and dired meet
;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Authors: Benjamin Rutt <brutt(a)bloomington.in.us>,
;; Shenghuo Zhu <zsh(a)cs.rochester.edu>
1.7 +36 -3 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-draft.el
Index: gnus-draft.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-draft.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnus-draft.el 2005/11/15 03:45:45 1.6
+++ gnus-draft.el 2006/03/16 04:17:46 1.7
@@ -1,7 +1,7 @@
;;; gnus-draft.el --- draft message support for Gnus
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
@@ -98,6 +98,7 @@
(interactive)
(let ((article (gnus-summary-article-number))
(group gnus-newsgroup-name))
+ (gnus-draft-check-draft-articles (list article))
(gnus-summary-mark-as-read article gnus-canceled-mark)
(gnus-draft-setup article group t)
(set-buffer-modified-p t)
@@ -122,6 +123,7 @@
(let* ((articles (gnus-summary-work-articles n))
(total (length articles))
article)
+ (gnus-draft-check-draft-articles articles)
(while (setq article (pop articles))
(gnus-summary-remove-process-mark article)
(unless (memq article gnus-newsgroup-unsendable)
@@ -144,6 +146,8 @@
message-send-hook))
(message-setup-hook (and (not is-queue)
message-setup-hook))
+ (message-signature (and (not is-queue)
+ message-signature))
(gnus-agent-queue-mail (and (not is-queue)
gnus-agent-queue-mail))
(rfc2047-encode-encoded-words nil)
@@ -152,7 +156,7 @@
;; We read the meta-information that says how and where
;; this message is to be sent.
(save-restriction
- (message-narrow-to-head)
+ (message-narrow-to-headers)
(when (re-search-forward
(concat "^" (regexp-quote gnus-agent-target-move-group-header)
":") nil t)
@@ -258,9 +262,12 @@
(goto-char (point-min))
(search-forward "\n\n")
(forward-char -1)
+ (save-restriction
+ (narrow-to-region (point-min) (point))
+ (setq ga
+ (message-fetch-field gnus-draft-meta-information-header)))
(insert mail-header-separator)
(forward-line 1)
- (setq ga (message-fetch-field gnus-draft-meta-information-header))
(message-set-auto-save-file-name))))
(gnus-backlog-remove-article group narticle)
(when (and ga
@@ -284,6 +291,32 @@
(defun gnus-draft-article-sendable-p (article)
"Say whether ARTICLE is sendable."
(not (memq article gnus-newsgroup-unsendable)))
+
+(defun gnus-draft-check-draft-articles (articles)
+ "Check whether the draft articles ARTICLES are under edit."
+ (when (equal gnus-newsgroup-name "nndraft:drafts")
+ (let ((buffers (buffer-list))
+ file buffs buff)
+ (save-current-buffer
+ (while (and articles
+ (not buff))
+ (setq file (nndraft-article-filename (pop articles))
+ buffs buffers)
+ (while buffs
+ (set-buffer (setq buff (pop buffs)))
+ (if (and buffer-file-name
+ (string-equal (file-truename buffer-file-name)
+ (file-truename file))
+ (buffer-modified-p))
+ (setq buffs nil)
+ (setq buff nil)))))
+ (when buff
+ (let* ((window (get-buffer-window buff t))
+ (frame (and window (window-frame window))))
+ (if frame
+ (gnus-select-frame-set-input-focus frame)
+ (pop-to-buffer buff t)))
+ (error "The draft %s is under edit" file)))))
(provide 'gnus-draft)
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-dup.el
Index: gnus-dup.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-dup.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-dup.el 2005/11/15 03:45:45 1.4
+++ gnus-dup.el 2006/03/16 04:17:46 1.5
@@ -1,7 +1,7 @@
;;; gnus-dup.el --- suppression of duplicate articles in Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-eform.el
Index: gnus-eform.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-eform.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-eform.el 2005/11/15 03:45:45 1.4
+++ gnus-eform.el 2006/03/16 04:17:46 1.5
@@ -1,7 +1,7 @@
;;; gnus-eform.el --- a mode for editing forms for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.7 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-ems.el
Index: gnus-ems.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-ems.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnus-ems.el 2005/11/15 03:45:45 1.6
+++ gnus-ems.el 2006/03/16 04:17:47 1.7
@@ -1,7 +1,7 @@
;;; gnus-ems.el --- functions for making Gnus work under different Emacsen
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.7 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-fun.el
Index: gnus-fun.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-fun.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnus-fun.el 2005/11/15 03:45:45 1.6
+++ gnus-fun.el 2006/03/16 04:17:47 1.7
@@ -1,6 +1,6 @@
;;; gnus-fun.el --- various frivolous extension functions to Gnus
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-gl.el
Index: gnus-gl.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-gl.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-gl.el 2005/11/15 03:45:46 1.4
+++ gnus-gl.el 2006/03/16 04:17:47 1.5
@@ -1,7 +1,7 @@
;;; gnus-gl.el --- an interface to GroupLens for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Brad Miller <bmiller(a)cs.umn.edu>
;; Keywords: news, score
1.7 +34 -10 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-group.el
Index: gnus-group.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-group.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnus-group.el 2005/11/15 03:45:46 1.6
+++ gnus-group.el 2006/03/16 04:17:47 1.7
@@ -1,7 +1,7 @@
;;; gnus-group.el --- group mode commands for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
@@ -284,14 +284,15 @@ variable."
:type 'hook)
(defcustom gnus-useful-groups
- '(("(ding) mailing list mirrored at sunsite.auc.dk"
- "emacs.ding"
- (nntp "sunsite.auc.dk"
- (nntp-address "sunsite.auc.dk")))
- ("gnus-bug archive"
- "gnus-bug"
- (nndir "/ftp@ftp.ifi.uio.no:/pub/emacs/gnus/gnus-bug/"))
- ("Gnus help group"
+ '(("(ding) mailing list mirrored at gmane.org"
+ "gmane.emacs.gnus.general"
+ (nntp "Gmane"
+ (nntp-address "news.gmane.org")))
+ ("Gnus bug archive"
+ "gnus.gnus-bug"
+ (nntp "news.gnus.org"
+ (nntp-address "news.gnus.org")))
+ ("Local Gnus help group"
"gnus-help"
(nndoc "gnus-help"
(nndoc-article-type mbox)
@@ -1378,6 +1379,18 @@ if it is a string, only list groups matc
(gnus-range-difference (list active) (gnus-info-read info))
seen))))))
+(defcustom gnus-group-update-tool-bar
+ (and (not (featurep 'xemacs))
+ (boundp 'tool-bar-mode)
+ tool-bar-mode
+ ;; Using `redraw-frame' (see `gnus-tool-bar-update') in Emacs 21 might
+ ;; be confusing, so maybe we shouldn't call it by default.
+ (fboundp 'force-window-update))
+ "Force updating the group buffer tool bar."
+:group 'gnus-group
+:version "22.1"
+:type 'boolean)
+
(defun gnus-group-insert-group-line (gnus-tmp-group gnus-tmp-level
gnus-tmp-marked number
gnus-tmp-method)
@@ -1446,8 +1459,10 @@ if it is a string, only list groups matc
(bbb-grouplens-group-p gnus-tmp-group))
""))
(buffer-read-only nil)
+ beg end
header gnus-tmp-header) ; passed as parameter to user-funcs.
(beginning-of-line)
+ (setq beg (point))
(gnus-add-text-properties
(point)
(prog1 (1+ (point))
@@ -1462,6 +1477,12 @@ if it is a string, only list groups matc
gnus-marked ,gnus-tmp-marked-mark
gnus-indentation ,gnus-group-indentation
gnus-level ,gnus-tmp-level))
+ (setq end (point))
+ (when gnus-group-update-tool-bar
+ (gnus-put-text-property beg end 'point-entered
+ 'gnus-tool-bar-update)
+ (gnus-put-text-property beg end 'point-left
+ 'gnus-tool-bar-update))
(forward-line -1)
(when (inline (gnus-visual-p 'group-highlight 'highlight))
(gnus-run-hooks 'gnus-group-update-hook))
@@ -3601,7 +3622,10 @@ re-scanning. If ARG is non-nil and not
;; We might read in new NoCeM messages here.
(when (and gnus-use-nocem
- (null arg))
+ (or (and (numberp gnus-use-nocem)
+ (numberp arg)
+ (>= arg gnus-use-nocem))
+ (not arg)))
(gnus-nocem-scan-groups))
;; If ARG is not a number, then we read the active file.
(when (and arg (not (numberp arg)))
1.8 +7 -5 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-int.el
Index: gnus-int.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-int.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gnus-int.el 2005/11/15 03:45:46 1.7
+++ gnus-int.el 2006/03/16 04:17:48 1.8
@@ -1,7 +1,7 @@
;;; gnus-int.el --- backend interface functions for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
@@ -250,10 +250,12 @@ If it is down, start it up (again)."
;; recurse to open the agent's backend.
(setq open-offline (eq gnus-server-unopen-status
'offline))
gnus-server-unopen-status)
- ((gnus-y-or-n-p
- (format "Unable to open %s:%s, go offline? "
- (car gnus-command-method)
- (cadr gnus-command-method)))
+ ((and
+ (not gnus-batch-mode)
+ (gnus-y-or-n-p
+ (format "Unable to open %s:%s, go offline? "
+ (car gnus-command-method)
+ (cadr gnus-command-method))))
(setq open-offline t)
'offline)
(t
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-kill.el
Index: gnus-kill.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-kill.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-kill.el 2005/11/15 03:45:46 1.4
+++ gnus-kill.el 2006/03/16 04:17:48 1.5
@@ -1,7 +1,7 @@
;;; gnus-kill.el --- kill commands for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin(a)flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi(a)gnus.org>
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-logic.el
Index: gnus-logic.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-logic.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnus-logic.el 2005/11/15 03:45:46 1.5
+++ gnus-logic.el 2006/03/16 04:17:48 1.6
@@ -1,7 +1,7 @@
;;; gnus-logic.el --- advanced scoring code for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.4 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-mh.el
Index: gnus-mh.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-mh.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gnus-mh.el 2005/11/15 03:45:47 1.3
+++ gnus-mh.el 2006/03/16 04:17:48 1.4
@@ -1,7 +1,7 @@
;;; gnus-mh.el --- mh-e interface for Gnus
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin(a)flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi(a)gnus.org>
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-ml.el
Index: gnus-ml.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-ml.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-ml.el 2005/11/15 03:45:47 1.4
+++ gnus-ml.el 2006/03/16 04:17:49 1.5
@@ -1,7 +1,7 @@
;;; gnus-ml.el --- Mailing list minor mode for Gnus
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Julien Gilles <jgilles(a)free.fr>
;; Keywords: news
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-mlspl.el
Index: gnus-mlspl.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-mlspl.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-mlspl.el 2005/11/15 03:45:47 1.4
+++ gnus-mlspl.el 2006/03/16 04:17:49 1.5
@@ -1,7 +1,7 @@
;;; gnus-mlspl.el --- a group params-based mail splitting mechanism
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Alexandre Oliva <oliva(a)lsd.ic.unicamp.br>
;; Keywords: news, mail
1.4 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-move.el
Index: gnus-move.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-move.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gnus-move.el 2005/11/15 03:45:47 1.3
+++ gnus-move.el 2006/03/16 04:17:49 1.4
@@ -1,7 +1,7 @@
;;; gnus-move.el --- commands for moving Gnus from one server to another
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.9 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-msg.el
Index: gnus-msg.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-msg.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gnus-msg.el 2006/01/04 07:05:29 1.8
+++ gnus-msg.el 2006/03/16 04:17:49 1.9
@@ -1,7 +1,7 @@
;;; gnus-msg.el --- mail and post interface for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin(a)flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi(a)gnus.org>
1.6 +13 -7 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-nocem.el
Index: gnus-nocem.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-nocem.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnus-nocem.el 2005/11/15 03:45:47 1.5
+++ gnus-nocem.el 2006/03/16 04:17:50 1.6
@@ -1,7 +1,7 @@
;;; gnus-nocem.el --- NoCeM pseudo-cancellation treatment
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
@@ -136,6 +136,7 @@ valid issuer, which is much faster if yo
(gnus-sethash group t gnus-nocem-real-group-hashtb))
gnus-newsrc-alist))
+;;;###autoload
(defun gnus-nocem-scan-groups ()
"Scan all NoCeM groups for new NoCeM messages."
(interactive)
@@ -206,10 +207,10 @@ valid issuer, which is much faster if yo
(not (member (mail-header-message-id header)
gnus-nocem-seen-message-ids))))
(push header check-headers)))
- (let* ((i 0)
- (check-headers
- (last check-headers gnus-nocem-check-article-limit))
- (len (length check-headers)))
+ (setq check-headers (last (nreverse check-headers)
+ gnus-nocem-check-article-limit))
+ (let ((i 0)
+ (len (length check-headers)))
(dolist (h check-headers)
(gnus-message
7 "Checking article %d in %s for NoCeM (%d of %d)..."
@@ -235,9 +236,13 @@ valid issuer, which is much faster if yo
(days-to-time gnus-nocem-expiry-wait)))
(gnus-request-article-this-buffer (mail-header-number header) group)
(goto-char (point-min))
- (when (re-search-forward "-----BEGIN PGP MESSAGE-----" nil t)
+ (when (re-search-forward
+ "-----BEGIN PGP\\( SIGNED\\)? MESSAGE-----"
+ nil t)
(delete-region (point-min) (match-beginning 0)))
- (when (re-search-forward "-----END PGP MESSAGE-----\n?" nil t)
+ (when (re-search-forward
+ "-----END PGP \\(MESSAGE\\|SIGNATURE\\)-----\n?"
+ nil t)
(delete-region (match-end 0) (point-max)))
(goto-char (point-min))
;; The article has to have proper NoCeM headers.
@@ -334,6 +339,7 @@ valid issuer, which is much faster if yo
gnus-nocem-alist))
t)))
+;;;###autoload
(defun gnus-nocem-load-cache ()
"Load the NoCeM cache."
(interactive)
1.8 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-picon.el
Index: gnus-picon.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-picon.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gnus-picon.el 2005/11/15 03:45:47 1.7
+++ gnus-picon.el 2006/03/16 04:17:50 1.8
@@ -1,7 +1,7 @@
;;; gnus-picon.el --- displaying pretty icons in Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news xpm annotation glyph faces
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-range.el
Index: gnus-range.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-range.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnus-range.el 2005/11/15 03:45:47 1.5
+++ gnus-range.el 2006/03/16 04:17:50 1.6
@@ -1,7 +1,7 @@
;;; gnus-range.el --- range and sequence functions for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.7 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-registry.el
Index: gnus-registry.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-registry.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnus-registry.el 2005/11/15 03:45:48 1.6
+++ gnus-registry.el 2006/03/16 04:17:50 1.7
@@ -1,7 +1,7 @@
;;; gnus-registry.el --- article registry for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Ted Zlatanov <tzz(a)lifelogs.com>
;; Keywords: news
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-salt.el
Index: gnus-salt.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-salt.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-salt.el 2005/11/15 03:45:48 1.4
+++ gnus-salt.el 2006/03/16 04:17:51 1.5
@@ -1,7 +1,7 @@
;;; gnus-salt.el --- alternate summary mode interfaces for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.7 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-score.el
Index: gnus-score.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-score.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnus-score.el 2005/11/15 03:45:48 1.6
+++ gnus-score.el 2006/03/16 04:17:51 1.7
@@ -1,7 +1,7 @@
;;; gnus-score.el --- scoring code for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Per Abrahamsen <amanda(a)iesd.auc.dk>
;; Lars Magne Ingebrigtsen <larsi(a)gnus.org>
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-setup.el
Index: gnus-setup.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-setup.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-setup.el 2005/11/15 03:45:48 1.4
+++ gnus-setup.el 2006/03/16 04:17:51 1.5
@@ -1,7 +1,7 @@
;;; gnus-setup.el --- Initialization & Setup for Gnus 5
;; Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Steven L. Baur <steve(a)miranova.com>
;; Keywords: news
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-sieve.el
Index: gnus-sieve.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-sieve.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-sieve.el 2005/11/15 03:45:48 1.4
+++ gnus-sieve.el 2006/03/16 04:17:52 1.5
@@ -1,6 +1,6 @@
;;; gnus-sieve.el --- Utilities to manage sieve scripts for Gnus
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: NAGY Andras <nagya(a)inf.elte.hu>,
;; Simon Josefsson <simon(a)josefsson.org>
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-soup.el
Index: gnus-soup.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-soup.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnus-soup.el 2005/11/15 03:45:48 1.5
+++ gnus-soup.el 2006/03/16 04:17:52 1.6
@@ -1,7 +1,7 @@
;;; gnus-soup.el --- SOUP packet writing support for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Per Abrahamsen <abraham(a)iesd.auc.dk>
;; Lars Magne Ingebrigtsen <larsi(a)gnus.org>
1.7 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-spec.el
Index: gnus-spec.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-spec.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnus-spec.el 2005/11/15 03:45:48 1.6
+++ gnus-spec.el 2006/03/16 04:17:52 1.7
@@ -1,7 +1,7 @@
;;; gnus-spec.el --- format spec functions for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.7 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-srvr.el
Index: gnus-srvr.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-srvr.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnus-srvr.el 2005/11/15 03:45:49 1.6
+++ gnus-srvr.el 2006/03/16 04:17:52 1.7
@@ -1,7 +1,7 @@
;;; gnus-srvr.el --- virtual server support for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.9 +8 -4 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-start.el
Index: gnus-start.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-start.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gnus-start.el 2005/12/19 13:35:25 1.8
+++ gnus-start.el 2006/03/16 04:17:53 1.9
@@ -1,7 +1,7 @@
;;; gnus-start.el --- startup functions for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
@@ -1047,9 +1047,12 @@ If LEVEL is non-nil, the news will be se
(gnus-check-bogus-newsgroups))
;; We might read in new NoCeM messages here.
- (when (and gnus-use-nocem
- (not level)
- (not dont-connect))
+ (when (and (not dont-connect)
+ gnus-use-nocem
+ (or (and (numberp gnus-use-nocem)
+ (numberp level)
+ (>= level gnus-use-nocem))
+ (not level)))
(gnus-nocem-scan-groups))
;; Read any slave files.
@@ -2818,6 +2821,7 @@ If FORCE is non-nil, the .newsrc file is
(print-escape-nonascii t)
(print-length nil)
(print-level nil)
+ (print-circle nil)
(print-escape-newlines t)
(gnus-killed-list
(if (and gnus-save-killed-list
1.10 +12 -7 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-sum.el
Index: gnus-sum.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-sum.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gnus-sum.el 2006/01/04 07:05:29 1.9
+++ gnus-sum.el 2006/03/16 04:17:53 1.10
@@ -1,7 +1,7 @@
;;; gnus-sum.el --- summary mode commands for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
@@ -3098,8 +3098,11 @@ display only a single character."
(aset table ?\r nil)
;; We keep TAB as well.
(aset table ?\t nil)
- ;; We nix out any glyphs over 126 that are not set already.
- (let ((i 256))
+ ;; We nix out any glyphs 127 through 255, or 127 through 159 in
+ ;; Emacs 23 (unicode), that are not set already.
+ (let ((i (if (ignore-errors (= (make-char 'latin-iso8859-1 160) 160))
+ 160
+ 256)))
(while (>= (setq i (1- i)) 127)
;; Only modify if the entry is nil.
(unless (aref table i)
@@ -6452,10 +6455,12 @@ displayed, no centering will be performe
(setq nlast (if (atom (cadr read)) (cadr read) (caadr read)))
(setq read (cdr read)))))
;; And add the last unread articles.
- (cond ((< first last)
- (push (cons first last) unread))
- ((= first last)
- (push first unread)))
+ (cond ((not (and first last))
+ nil)
+ ((< first last)
+ (push (cons first last) unread))
+ ((= first last)
+ (push first unread)))
;; Return the sequence of unread articles.
(delq 0 (nreverse unread))))
1.6 +6 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-topic.el
Index: gnus-topic.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-topic.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnus-topic.el 2005/11/15 03:45:49 1.5
+++ gnus-topic.el 2006/03/16 04:17:54 1.6
@@ -1,7 +1,7 @@
;;; gnus-topic.el --- a folding minor mode for Gnus group buffers
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Ilja Weis <kult(a)uni-paderborn.de>
;; Lars Magne Ingebrigtsen <larsi(a)gnus.org>
@@ -585,6 +585,11 @@ articles in the topic and its subtopics.
(not (eq (nth 2 type) 'hidden))
level all-entries unread))
(gnus-topic-update-unreads (car type) unread)
+ (when gnus-group-update-tool-bar
+ (gnus-put-text-property beg end 'point-entered
+ 'gnus-tool-bar-update)
+ (gnus-put-text-property beg end 'point-left
+ 'gnus-tool-bar-update))
(goto-char end)
unread))
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-undo.el
Index: gnus-undo.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-undo.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-undo.el 2005/11/15 03:45:49 1.4
+++ gnus-undo.el 2006/03/16 04:17:54 1.5
@@ -1,7 +1,7 @@
;;; gnus-undo.el --- minor mode for undoing in Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.12 +21 -3 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-util.el
Index: gnus-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-util.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gnus-util.el 2005/11/15 03:45:50 1.11
+++ gnus-util.el 2006/03/16 04:17:54 1.12
@@ -1,7 +1,7 @@
;;; gnus-util.el --- utility functions for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
@@ -497,7 +497,8 @@ inside loops."
(apply 'format args)))
(defun gnus-error (level &rest args)
- "Beep an error if LEVEL is equal to or less than `gnus-verbose'."
+ "Beep an error if LEVEL is equal to or less than `gnus-verbose'.
+ARGS are passed to `message'."
(when (<= (floor level) gnus-verbose)
(apply 'message args)
(ding)
@@ -1457,6 +1458,23 @@ Return nil otherwise."
(string-match "\\`[^:]*:[0-9]+\\(\\.[0-9]+\\)?\\'"
display))
display)))))
+
+(defun gnus-tool-bar-update (&rest ignore)
+ "Update the tool bar."
+ (when (and (boundp 'tool-bar-mode)
+ tool-bar-mode)
+ (let* ((args nil)
+ (func (cond ((featurep 'xemacs)
+ 'ignore)
+ ((fboundp 'tool-bar-update)
+ 'tool-bar-update)
+ ((fboundp 'force-window-update)
+ 'force-window-update)
+ ((fboundp 'redraw-frame)
+ (setq args (list (selected-frame)))
+ 'redraw-frame)
+ (t 'ignore))))
+ (apply func args))))
;; Fixme: This has only one use (in gnus-agent), which isn't worthwhile.
(defmacro gnus-mapcar (function seq1 &rest seqs2_n)
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-uu.el
Index: gnus-uu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-uu.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnus-uu.el 2005/11/15 03:45:50 1.5
+++ gnus-uu.el 2006/03/16 04:17:54 1.6
@@ -1,7 +1,7 @@
;;; gnus-uu.el --- extract (uu)encoded files in Gnus
;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998,
-;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Created: 2 Oct 1993
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-vm.el
Index: gnus-vm.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-vm.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnus-vm.el 2005/11/15 03:45:50 1.4
+++ gnus-vm.el 2006/03/16 04:17:54 1.5
@@ -1,7 +1,7 @@
;;; gnus-vm.el --- vm interface for Gnus
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Per Persson <pp(a)gnu.ai.mit.edu>
;; Keywords: news, mail
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-win.el
Index: gnus-win.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-win.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnus-win.el 2005/11/15 03:45:50 1.5
+++ gnus-win.el 2006/03/16 04:17:55 1.6
@@ -1,7 +1,7 @@
;;; gnus-win.el --- window configuration functions for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.10 +2 -2 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-xmas.el
Index: gnus-xmas.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-xmas.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gnus-xmas.el 2006/01/04 07:05:30 1.9
+++ gnus-xmas.el 2006/03/16 04:17:55 1.10
@@ -1,7 +1,7 @@
;;; gnus-xmas.el --- Gnus functions for XEmacs
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.11 +17 -6 XEmacs/packages/xemacs-packages/gnus/lisp/gnus.el
Index: gnus.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- gnus.el 2005/12/19 13:35:25 1.10
+++ gnus.el 2006/03/16 04:17:55 1.11
@@ -1,7 +1,7 @@
;;; gnus.el --- a newsreader for GNU Emacs
;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998,
-;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin(a)flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi(a)gnus.org>
@@ -1580,9 +1580,23 @@ articles. This is not a good idea."
:value t)))
(defcustom gnus-use-nocem nil
- "*If non-nil, Gnus will read NoCeM cancel messages."
+ "*If non-nil, Gnus will read NoCeM cancel messages.
+You can also set this variable to a positive number as a group level.
+In that case, Gnus scans NoCeM messages when checking new news if this
+value is not exceeding a group level that you specify as the prefix
+argument to some commands, e.g. `gnus', `gnus-group-get-new-news', etc.
+Otherwise, Gnus does not scan NoCeM messages if you specify a group
+level to those commands."
:group 'gnus-meta
-:type 'boolean)
+:type '(choice
+ (const :tag "off" nil)
+ (const :tag "on" t)
+ (list :convert-widget
+ (lambda (widget)
+ (list 'integer :tag "group level"
+ :value (if (boundp 'gnus-level-default-subscribed)
+ gnus-level-default-subscribed
+ 3))))))
(defcustom gnus-suppress-duplicates nil
"*If non-nil, Gnus will mark duplicate copies of the same article as read."
@@ -4256,9 +4270,6 @@ current display is used."
(cdr (frame-list)))
(delete-frame gnus-other-frame-object))
(setq gnus-other-frame-object nil)))))))
-
-;;(setq thing ? ; this is a comment
-;; more 'yes)
;;;###autoload
(defun gnus (&optional arg dont-connect slave)
1.6 +2 -2 XEmacs/packages/xemacs-packages/gnus/lisp/html2text.el
Index: html2text.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/html2text.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- html2text.el 2005/11/15 03:45:51 1.5
+++ html2text.el 2006/03/16 04:17:56 1.6
@@ -1,6 +1,6 @@
;;; html2text.el --- a simple html to plain text converter
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Joakim Hove <hove(a)phys.ntnu.no>
@@ -59,7 +59,7 @@ completely verbatim - without any use of
This is a list of tags which should be removed, without any
formatting. Note that tags in the list are presented *without*
-any \"<\" or \">\". All occurences of a tag appearing in this
+any \"<\" or \">\". All occurrences of a tag appearing in
this
list are removed, irrespective of whether it is a closing or
opening tag, or if the tag has additional attributes. The
deletion is done by the function `html2text-remove-tags'.
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/ietf-drums.el
Index: ietf-drums.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/ietf-drums.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ietf-drums.el 2005/11/15 03:45:51 1.5
+++ ietf-drums.el 2006/03/16 04:17:56 1.6
@@ -1,7 +1,7 @@
;;; ietf-drums.el --- Functions for parsing RFC822bis headers
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; This file is part of GNU Emacs.
1.8 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/imap.el
Index: imap.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/imap.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- imap.el 2005/12/19 13:35:25 1.7
+++ imap.el 2006/03/16 04:17:56 1.8
@@ -1,7 +1,7 @@
;;; imap.el --- imap library
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <jas(a)pdc.kth.se>
;; Keywords: mail
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/mail-parse.el
Index: mail-parse.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mail-parse.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mail-parse.el 2005/11/15 03:45:52 1.4
+++ mail-parse.el 2006/03/16 04:17:56 1.5
@@ -1,7 +1,7 @@
;;; mail-parse.el --- Interface functions for parsing mail
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; This file is part of GNU Emacs.
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/mail-prsvr.el
Index: mail-prsvr.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mail-prsvr.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mail-prsvr.el 2005/11/15 03:45:52 1.4
+++ mail-prsvr.el 2006/03/16 04:17:56 1.5
@@ -1,7 +1,7 @@
;;; mail-prsvr.el --- Interface variables for parsing mail
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; This file is part of GNU Emacs.
1.8 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/mail-source.el
Index: mail-source.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mail-source.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mail-source.el 2005/11/15 03:45:52 1.7
+++ mail-source.el 2006/03/16 04:17:56 1.8
@@ -1,7 +1,7 @@
;;; mail-source.el --- functions for fetching mail
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news, mail
1.7 +32 -26 XEmacs/packages/xemacs-packages/gnus/lisp/mailcap.el
Index: mailcap.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mailcap.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mailcap.el 2005/11/15 03:45:52 1.6
+++ mailcap.el 2006/03/16 04:17:56 1.7
@@ -1,7 +1,7 @@
;;; mailcap.el --- MIME media types configuration
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: William M. Perry <wmperry(a)aventail.com>
;; Lars Magne Ingebrigtsen <larsi(a)gnus.org>
@@ -528,7 +528,12 @@ MAILCAPS if set; otherwise (on Unix) use
(skip-chars-forward ";"))
(setq done t))))
(setq value (buffer-substring val-pos (point))))
- (setq results (cons (cons name value) results))
+ ;; `test' as symbol, others like "copiousoutput" and "needsx11"
as
+ ;; strings
+ (setq results (cons (cons (if (string-equal name "test")
+ 'test
+ name)
+ value) results))
(skip-chars-forward " \";\n\t"))
results)))
@@ -635,30 +640,31 @@ to supply to the test."
(viewer (cdr (assoc 'viewer viewer-info)))
(default-directory (expand-file-name "~/"))
status parsed-test cache result)
- (if (setq cache (assoc test mailcap-viewer-test-cache))
- (cadr cache)
- (setq
- result
- (cond
- ((not test-info) t) ; No test clause
- ((not test) nil) ; Already failed test
- ((eq test t) t) ; Already passed test
- ((functionp test) ; Lisp function as test
- (funcall test type-info))
- ((and (symbolp test) ; Lisp variable as test
- (boundp test))
- (symbol-value test))
- ((and (listp test) ; List to be eval'd
- (symbolp (car test)))
- (eval test))
- (t
- (setq test (mailcap-unescape-mime-test test type-info)
- test (list shell-file-name nil nil nil
- shell-command-switch test)
- status (apply 'call-process test))
- (eq 0 status))))
- (push (list otest result) mailcap-viewer-test-cache)
- result)))
+ (cond ((setq cache (assoc test mailcap-viewer-test-cache))
+ (cadr cache))
+ ((not test-info) t) ; No test clause
+ (t
+ (setq
+ result
+ (cond
+ ((not test) nil) ; Already failed test
+ ((eq test t) t) ; Already passed test
+ ((functionp test) ; Lisp function as test
+ (funcall test type-info))
+ ((and (symbolp test) ; Lisp variable as test
+ (boundp test))
+ (symbol-value test))
+ ((and (listp test) ; List to be eval'd
+ (symbolp (car test)))
+ (eval test))
+ (t
+ (setq test (mailcap-unescape-mime-test test type-info)
+ test (list shell-file-name nil nil nil
+ shell-command-switch test)
+ status (apply 'call-process test))
+ (eq 0 status))))
+ (push (list otest result) mailcap-viewer-test-cache)
+ result))))
(defun mailcap-add-mailcap-entry (major minor info)
(let ((old-major (assoc major mailcap-mime-data)))
1.9 +37 -11 XEmacs/packages/xemacs-packages/gnus/lisp/message.el
Index: message.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/message.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- message.el 2005/12/19 13:35:25 1.8
+++ message.el 2006/03/16 04:17:57 1.9
@@ -1,7 +1,7 @@
;;; message.el --- composing mail and news messages
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: mail, news
@@ -1388,8 +1388,13 @@ should be sent in several parts. If it
(integer 1000000)))
(defcustom message-alternative-emails nil
- "A regexp to match the alternative email addresses.
-The first matched address (not primary one) is used in the From field."
+ "*Regexp matching alternative email addresses.
+The first address in the To, Cc or From headers of the original
+article matching this variable is used as the From field of
+outgoing messages.
+
+This variable has precedence over posting styles and anything that runs
+off `message-setup-hook'."
:group 'message-headers
:link '(custom-manual "(message)Message Headers")
:type '(choice (const :tag "Always use primary" nil)
@@ -2185,6 +2190,15 @@ Point is left at the beginning of the na
(1+ max)))))
(message-sort-headers-1))))
+(defun message-info (&optional arg)
+ "Display the Message manual.
+
+Prefixed with one \\[universal-argument], display the Emacs MIME manual.
+Prefixed with two \\[universal-argument]'s, display the PGG manual."
+ (interactive "p")
+ (cond ((eq arg 16) (Info-goto-node "(pgg)Top"))
+ ((eq arg 4) (Info-goto-node "(emacs-mime)Top"))
+ (t (Info-goto-node "(message)Top"))))
@@ -2312,7 +2326,11 @@ Point is left at the beginning of the na
'(:help "Ask, then arrange to send message at that time"))]
["Kill Message" message-kill-buffer
,@(if (featurep 'xemacs) '(t)
- '(:help "Delete this message without sending"))]))
+ '(:help "Delete this message without sending"))]
+ "----"
+ ["Message manual" message-info
+ ,@(if (featurep 'xemacs) '(t)
+ '(:help "Display the Message manual"))]))
(easy-menu-define
message-mode-field-menu message-mode-map ""
@@ -3597,8 +3615,8 @@ It should typically alter the sending me
(when (let ((char (char-after)))
(or (< (mm-char-int char) 128)
(and (mm-multibyte-p)
- ;; Fixme: Wrong for Emacs 22 and for things
- ;; like undecable utf-8. Should at least
+ ;; FIXME: Wrong for Emacs 23 (unicode) and for
+ ;; things like undecable utf-8. Should at least
;; use find-coding-systems-region.
(memq (char-charset char)
'(eight-bit-control eight-bit-graphic
@@ -4653,7 +4671,9 @@ If NOW, use that time instead."
(* 25 25)))
(let ((tm (current-time)))
(concat
- (if (memq system-type '(ms-dos emx vax-vms))
+ (if (or (memq system-type '(ms-dos emx vax-vms))
+ ;; message-number-base36 doesn't handle bigints.
+ (floatp (user-uid)))
(let ((user (downcase (user-login-name))))
(while (string-match "[^a-z0-9_]" user)
(aset user (match-beginning 0) ?_))
@@ -5533,10 +5553,6 @@ are not included."
(when message-default-mail-headers
(insert message-default-mail-headers)
(or (bolp) (insert ?\n)))
- (save-restriction
- (message-narrow-to-headers)
- (if message-alternative-emails
- (message-use-alternative-email-as-from)))
(when message-generate-headers-first
(message-generate-headers
(message-headers-to-generate
@@ -5552,6 +5568,12 @@ are not included."
(set-buffer-modified-p nil)
(setq buffer-undo-list nil)
(run-hooks 'message-setup-hook)
+ ;; Do this last to give it precedence over posting styles, etc.
+ (when (message-mail-p)
+ (save-restriction
+ (message-narrow-to-headers)
+ (if message-alternative-emails
+ (message-use-alternative-email-as-from))))
(message-position-point)
(undo-boundary))
@@ -6835,6 +6857,9 @@ regexp VARSTR."
(read-string prompt initial-contents))))
(defun message-use-alternative-email-as-from ()
+ "Set From field of the outgoing message to the first matching
+address in `message-alternative-emails', looking at To, Cc and
+From headers in the original article."
(require 'mail-utils)
(let* ((fields '("To" "Cc"))
(emails
@@ -6849,6 +6874,7 @@ regexp VARSTR."
emails nil))
(pop emails))
(unless (or (not email) (equal email user-mail-address))
+ (message-remove-header "From")
(goto-char (point-max))
(insert "From: " email "\n"))))
1.6 +2 -2 XEmacs/packages/xemacs-packages/gnus/lisp/messagexmas.el
Index: messagexmas.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/messagexmas.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- messagexmas.el 2005/12/19 13:35:25 1.5
+++ messagexmas.el 2006/03/16 04:17:57 1.6
@@ -1,7 +1,7 @@
;;; messagexmas.el --- XEmacs extensions to message
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003,
+;; 2005 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: mail, news
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/messcompat.el
Index: messcompat.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/messcompat.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- messcompat.el 2005/11/15 03:45:53 1.4
+++ messcompat.el 2006/03/16 04:17:57 1.5
@@ -1,7 +1,7 @@
;;; messcompat.el --- making message mode compatible with mail mode
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: mail, news
1.9 +4 -4 XEmacs/packages/xemacs-packages/gnus/lisp/mm-bodies.el
Index: mm-bodies.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mm-bodies.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mm-bodies.el 2005/12/19 13:35:25 1.8
+++ mm-bodies.el 2006/03/16 04:17:57 1.9
@@ -1,7 +1,7 @@
;;; mm-bodies.el --- Functions for decoding MIME things
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; MORIOKA Tomohiko <morioka(a)jaist.ac.jp>
@@ -249,7 +249,8 @@ decoding. If it is nil, default to `mai
(save-excursion
(when encoding
(mm-decode-content-transfer-encoding encoding type))
- (when (featurep 'mule) ; Fixme: Wrong test for unibyte session.
+ (when (and (featurep 'mule) ;; Fixme: Wrong test for unibyte session.
+ (not (eq charset 'gnus-decoded)))
(let ((coding-system (mm-charset-to-coding-system charset)))
(if (and (not coding-system)
(listp mail-parse-ignored-charsets)
@@ -262,8 +263,7 @@ decoding. If it is nil, default to `mai
;;in XEmacs
(mm-multibyte-p)
(or (not (eq coding-system 'ascii))
- (setq coding-system mail-parse-charset))
- (not (eq coding-system 'gnus-decoded)))
+ (setq coding-system mail-parse-charset)))
(mm-decode-coding-region (point-min) (point-max)
coding-system))
(setq buffer-file-coding-system
1.9 +39 -37 XEmacs/packages/xemacs-packages/gnus/lisp/mm-decode.el
Index: mm-decode.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mm-decode.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mm-decode.el 2005/12/19 13:35:25 1.8
+++ mm-decode.el 2006/03/16 04:17:58 1.9
@@ -1,7 +1,7 @@
;;; mm-decode.el --- Functions for decoding MIME things
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; MORIOKA Tomohiko <morioka(a)jaist.ac.jp>
@@ -279,7 +279,9 @@ before the external MIME handler is invo
"application/x-emacs-lisp"
"application/pgp-signature" "application/x-pkcs7-signature"
"application/pkcs7-signature" "application/x-pkcs7-mime"
- "application/pkcs7-mime")
+ "application/pkcs7-mime"
+ ;; Mutt still uses this even though it has already been withdrawn.
+ "application/pgp")
"List of media types that are to be displayed inline.
See also `mm-inline-media-tests', which says how to display a media
type inline."
@@ -302,7 +304,9 @@ when selecting a different article."
"application/emacs-lisp" "application/x-emacs-lisp"
"application/x-pkcs7-signature"
"application/pkcs7-signature" "application/x-pkcs7-mime"
- "application/pkcs7-mime")
+ "application/pkcs7-mime"
+ ;; Mutt still uses this even though it has already been withdrawn.
+ "application/pgp")
"A list of MIME types to be displayed automatically."
:type '(repeat regexp)
:group 'mime-display)
@@ -530,13 +534,13 @@ Postpone undisplaying of viewers for typ
loose-mime
(mail-fetch-field "mime-version"))
(setq ct (mail-fetch-field "content-type")
- ctl (ignore-errors (mail-header-parse-content-type ct))
+ ctl (and ct (mail-header-parse-content-type ct))
cte (mail-fetch-field "content-transfer-encoding")
cd (mail-fetch-field "content-disposition")
description (mail-fetch-field "content-description")
id (mail-fetch-field "content-id"))
(unless from
- (setq from (mail-fetch-field "from")))
+ (setq from (mail-fetch-field "from")))
;; FIXME: In some circumstances, this code is running within
;; an unibyte macro. mail-extract-address-components
;; creates unibyte buffers. This `if', though not a perfect
@@ -553,7 +557,7 @@ Postpone undisplaying of viewers for typ
(mail-header-remove-comments
cte)))))
no-strict-mime
- (and cd (ignore-errors (mail-header-parse-content-disposition cd)))
+ (and cd (mail-header-parse-content-disposition cd))
description)
(setq type (split-string (car ctl) "/"))
(setq subtype (cadr type)
@@ -588,8 +592,7 @@ Postpone undisplaying of viewers for typ
(mail-header-remove-comments
cte)))))
no-strict-mime
- (and cd (ignore-errors
- (mail-header-parse-content-disposition cd)))
+ (and cd (mail-header-parse-content-disposition cd))
description id)
ctl))))
(when id
@@ -766,19 +769,18 @@ external if displayed external."
(gnus-map-function mm-file-name-rewrite-functions
(file-name-nondirectory filename))
dir))
- (setq file (mm-make-temp-file (expand-file-name "mm." dir)))
- (let ((newname
- ;; Use nametemplate (defined in RFC1524) if it is
- ;; specified in mailcap.
- (if (assoc "nametemplate" mime-info)
- (format (cdr (assoc "nametemplate" mime-info)) file)
- ;; Add a suffix according to `mailcap-mime-extensions'.
- (concat file (car (rassoc (mm-handle-media-type handle)
- mailcap-mime-extensions))))))
- (unless (string-equal file newname)
- (when (file-exists-p file)
- (rename-file file newname))
- (setq file newname))))
+ ;; Use nametemplate (defined in RFC1524) if it is specified
+ ;; in mailcap.
+ (let ((suffix (cdr (assoc "nametemplate" mime-info))))
+ (if (and suffix
+ (string-match "\\`%s\\(\\..+\\)\\'" suffix))
+ (setq suffix (match-string 1 suffix))
+ ;; Otherwise, use a suffix according to
+ ;; `mailcap-mime-extensions'.
+ (setq suffix (car (rassoc (mm-handle-media-type handle)
+ mailcap-mime-extensions))))
+ (setq file (mm-make-temp-file (expand-file-name "mm." dir)
+ nil suffix))))
(let ((coding-system-for-write mm-binary-coding-system))
(write-region (point-min) (point-max) file nil 'nomesg))
(message "Viewing with %s" method)
@@ -1082,14 +1084,16 @@ external if displayed external."
(defun mm-get-part (handle)
"Return the contents of HANDLE as a string."
- (mm-with-unibyte-buffer
- (insert (with-current-buffer (mm-handle-buffer handle)
- (mm-with-unibyte-current-buffer
- (buffer-string))))
- (mm-decode-content-transfer-encoding
- (mm-handle-encoding handle)
- (mm-handle-media-type handle))
- (buffer-string)))
+ (let ((default-enable-multibyte-characters
+ (with-current-buffer (mm-handle-buffer handle)
+ (mm-multibyte-p))))
+ (with-temp-buffer
+ (insert-buffer-substring (mm-handle-buffer handle))
+ (mm-disable-multibyte)
+ (mm-decode-content-transfer-encoding
+ (mm-handle-encoding handle)
+ (mm-handle-media-type handle))
+ (buffer-string))))
(defun mm-insert-part (handle)
"Insert the contents of HANDLE in the current buffer."
@@ -1309,8 +1313,8 @@ be determined."
;; out to a file, and then create a file
;; specifier.
(let ((file (mm-make-temp-file
- (expand-file-name "emm.xbm"
- mm-tmp-directory))))
+ (expand-file-name "emm" mm-tmp-directory)
+ nil ".xbm")))
(unwind-protect
(progn
(write-region (point-min) (point-max) file)
@@ -1397,9 +1401,8 @@ If RECURSIVE, search recursively."
(save-excursion
(save-restriction
(narrow-to-region start (1- (point)))
- (when (let ((ctl (ignore-errors
- (mail-header-parse-content-type
- (mail-fetch-field "content-type")))))
+ (when (let* ((ct (mail-fetch-field "content-type"))
+ (ctl (and ct (mail-header-parse-content-type ct))))
(if notp
(not (equal (car ctl) type))
(equal (car ctl) type)))
@@ -1410,9 +1413,8 @@ If RECURSIVE, search recursively."
(save-excursion
(save-restriction
(narrow-to-region start end)
- (when (let ((ctl (ignore-errors
- (mail-header-parse-content-type
- (mail-fetch-field "content-type")))))
+ (when (let* ((ct (mail-fetch-field "content-type"))
+ (ctl (and ct (mail-header-parse-content-type ct))))
(if notp
(not (equal (car ctl) type))
(equal (car ctl) type)))
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/mm-encode.el
Index: mm-encode.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mm-encode.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mm-encode.el 2005/11/15 03:45:53 1.5
+++ mm-encode.el 2006/03/16 04:17:58 1.6
@@ -1,7 +1,7 @@
;;; mm-encode.el --- Functions for encoding MIME things
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; MORIOKA Tomohiko <morioka(a)jaist.ac.jp>
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/mm-extern.el
Index: mm-extern.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mm-extern.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mm-extern.el 2005/11/15 03:45:54 1.4
+++ mm-extern.el 2006/03/16 04:17:58 1.5
@@ -1,7 +1,7 @@
;;; mm-extern.el --- showing message/external-body
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh(a)cs.rochester.edu>
;; Keywords: message external-body
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/mm-partial.el
Index: mm-partial.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mm-partial.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mm-partial.el 2005/11/15 03:45:54 1.4
+++ mm-partial.el 2006/03/16 04:17:58 1.5
@@ -1,7 +1,7 @@
;;; mm-partial.el --- showing message/partial
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh(a)cs.rochester.edu>
;; Keywords: message partial
1.6 +5 -2 XEmacs/packages/xemacs-packages/gnus/lisp/mm-url.el
Index: mm-url.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mm-url.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mm-url.el 2005/11/15 03:45:54 1.5
+++ mm-url.el 2006/03/16 04:17:58 1.6
@@ -1,6 +1,6 @@
;;; mm-url.el --- a wrapper of url functions/commands for Gnus
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh(a)cs.rochester.edu>
@@ -276,7 +276,10 @@ This is taken from RFC 2396.")
(defun mm-url-load-url ()
"Load `url-insert-file-contents'."
(unless (condition-case ()
- (require 'url-handlers)
+ (progn
+ (require 'url-handlers)
+ (require 'url-parse)
+ (require 'url-vars))
(error nil))
;; w3-4.0pre0.46 or earlier version.
(require 'w3-vars)
1.10 +83 -15 XEmacs/packages/xemacs-packages/gnus/lisp/mm-util.el
Index: mm-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mm-util.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mm-util.el 2005/11/15 03:45:54 1.9
+++ mm-util.el 2006/03/16 04:17:58 1.10
@@ -1,7 +1,7 @@
;;; mm-util.el --- Utility functions for Mule and low level things
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; MORIOKA Tomohiko <morioka(a)jaist.ac.jp>
@@ -99,16 +99,6 @@
(lambda (ch) (mm-string-as-multibyte (char-to-string ch)))
string "")))
(multibyte-string-p . ignore)
- ;; It is not a MIME function, but some MIME functions use it.
- (make-temp-file . (lambda (prefix &optional dir-flag)
- (let ((file (expand-file-name
- (make-temp-name prefix)
- (if (fboundp 'temp-directory)
- (temp-directory)
- temporary-file-directory))))
- (if dir-flag
- (make-directory file))
- file)))
(insert-byte . insert-char)
(multibyte-char-to-unibyte . identity))))
@@ -184,7 +174,7 @@ system object in XEmacs."
(if (fboundp 'coding-system-p)
(when (coding-system-p cs)
cs)
- ;; Is this branch ever actually useful?
+ ;; no-MULE XEmacs:
(car (memq cs (mm-get-coding-system-list))))))
(defvar mm-charset-synonym-alist
@@ -341,7 +331,7 @@ with Mule charsets. It is completely us
cs mime mule alist)
(while css
(setq cs (pop css)
- mime (or (coding-system-get cs :mime-charset) ; Emacs 22
+ mime (or (coding-system-get cs :mime-charset) ; Emacs 23 (unicode)
(coding-system-get cs 'mime-charset)))
(when (and mime
(not (eq t (setq mule
@@ -806,11 +796,18 @@ Use multibyte mode for this."
(defmacro mm-with-unibyte-current-buffer (&rest forms)
"Evaluate FORMS with current buffer temporarily made unibyte.
Also bind `default-enable-multibyte-characters' to nil.
-Equivalent to `progn' in XEmacs"
+Equivalent to `progn' in XEmacs
+
+NOTE: Use this macro with caution in multibyte buffers (it is not
+worth using this macro in unibyte buffers of course). Use of
+`(set-buffer-multibyte t)', which is run finally, is generally
+harmful since it is likely to modify existing data in the buffer.
+For instance, it converts \"\\300\\255\" into \"\\255\" in
+Emacs 23 (unicode)."
(let ((multibyte (make-symbol "multibyte"))
(buffer (make-symbol "buffer")))
`(if mm-emacs-mule
- (let ((,multibyte enable-multibyte-characters)
+ (let ((,multibyte enable-multibyte-characters)
(,buffer (current-buffer)))
(unwind-protect
(let (default-enable-multibyte-characters)
@@ -970,6 +967,77 @@ If INHIBIT is non-nil, inhibit `mm-inhib
inhibit-file-name-handlers)
inhibit-file-name-handlers)))
(write-region start end filename append visit lockname)))
+
+;; It is not a MIME function, but some MIME functions use it.
+(if (and (fboundp 'make-temp-file)
+ (ignore-errors
+ (let ((def (symbol-function 'make-temp-file)))
+ (and (byte-code-function-p def)
+ (setq def (if (fboundp 'compiled-function-arglist)
+ ;; XEmacs
+ (eval (list 'compiled-function-arglist def))
+ (aref def 0)))
+ (>= (length def) 4)
+ (eq (nth 3 def) 'suffix)))))
+ (defalias 'mm-make-temp-file 'make-temp-file)
+ ;; Stolen (and modified for Emacs 20 and XEmacs) from Emacs 22.
+ (defun mm-make-temp-file (prefix &optional dir-flag suffix)
+ "Create a temporary file.
+The returned file name (created by appending some random characters at the end
+of PREFIX, and expanding against `temporary-file-directory' if necessary),
+is guaranteed to point to a newly created empty file.
+You can then use `write-region' to write new data into the file.
+
+If DIR-FLAG is non-nil, create a new empty directory instead of a file.
+
+If SUFFIX is non-nil, add that at the end of the file name."
+ (let ((umask (default-file-modes))
+ file)
+ (unwind-protect
+ (progn
+ ;; Create temp files with strict access rights. It's easy to
+ ;; loosen them later, whereas it's impossible to close the
+ ;; time-window of loose permissions otherwise.
+ (set-default-file-modes 448)
+ (while (condition-case err
+ (progn
+ (setq file
+ (make-temp-name
+ (expand-file-name
+ prefix
+ (if (fboundp 'temp-directory)
+ ;; XEmacs
+ (temp-directory)
+ temporary-file-directory))))
+ (if suffix
+ (setq file (concat file suffix)))
+ (if dir-flag
+ (make-directory file)
+ (if (or (featurep 'xemacs)
+ (= emacs-major-version 20))
+ ;; NOTE: This is unsafe if Emacs 20
+ ;; users and XEmacs users don't use
+ ;; a secure temp directory.
+ (if (file-exists-p file)
+ (signal 'file-already-exists
+ (list "File exists" file))
+ (write-region "" nil file nil 'silent))
+ (write-region "" nil file nil 'silent
+ nil 'excl)))
+ nil)
+ (file-already-exists t)
+ ;; The Emacs 20 and XEmacs versions of
+ ;; `make-directory' issue `file-error'.
+ (file-error (or (and (or (featurep 'xemacs)
+ (= emacs-major-version 20))
+ (file-exists-p file))
+ (signal (car err) (cdr err)))))
+ ;; the file was somehow created by someone else between
+ ;; `make-temp-name' and `write-region', let's try again.
+ nil)
+ file)
+ ;; Reset the umask.
+ (set-default-file-modes umask)))))
(defun mm-image-load-path (&optional package)
(let (dir result)
1.7 +84 -18 XEmacs/packages/xemacs-packages/gnus/lisp/mm-uu.el
Index: mm-uu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mm-uu.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mm-uu.el 2005/11/15 03:45:54 1.6
+++ mm-uu.el 2006/03/16 04:17:59 1.7
@@ -1,7 +1,7 @@
;;; mm-uu.el --- Return uu stuff as mm handles
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh(a)cs.rochester.edu>
;; Keywords: postscript uudecode binhex shar forward gnatsweb pgp
@@ -174,6 +174,10 @@ To disable dissecting shar codes, for in
mm-uu-type-alist)
:group 'gnus-article-mime)
+(defvar mm-uu-text-plain-type '("text/plain" (charset . gnus-decoded))
+ "MIME type and parameters for text/plain parts.
+`gnus-decoded' is a fake charset, which means no further decoding.")
+
;; functions
(defsubst mm-uu-type (entry)
@@ -262,7 +266,7 @@ Return that buffer."
(defun mm-uu-emacs-sources-extract ()
(mm-make-handle (mm-uu-copy-to-buffer start-point end-point)
- '("application/emacs-lisp")
+ '("application/emacs-lisp" (charset . gnus-decoded))
nil nil
(list mm-dissect-disposition
(cons 'filename file-name))))
@@ -278,7 +282,7 @@ Return that buffer."
(defun mm-uu-diff-extract ()
(mm-make-handle (mm-uu-copy-to-buffer start-point end-point)
- '("text/x-patch")))
+ '("text/x-patch" (charset . gnus-decoded))))
(defun mm-uu-diff-test ()
(and gnus-newsgroup-name
@@ -375,7 +379,7 @@ Return that buffer."
(while (re-search-forward "^- " nil t)
(replace-match "" t t)
(forward-line 1)))
- (list (mm-make-handle buf '("text/plain" (charset . gnus-decoded))))))
+ (list (mm-make-handle buf mm-uu-text-plain-type))))
(defun mm-uu-pgp-signed-extract ()
(let ((mm-security-handle (list (format "multipart/signed"))))
@@ -407,9 +411,7 @@ Return that buffer."
(with-current-buffer buf
(mml2015-clean-buffer)
(funcall (mml2015-clear-decrypt-function))))
- (list
- (mm-make-handle buf
- '("text/plain" (charset . gnus-decoded))))))
+ (list (mm-make-handle buf mm-uu-text-plain-type))))
(defun mm-uu-pgp-encrypted-extract ()
(let ((mm-security-handle (list (format "multipart/encrypted"))))
@@ -443,25 +445,27 @@ Return that buffer."
'("application/pgp-keys"))))
;;;###autoload
-(defun mm-uu-dissect ()
- "Dissect the current buffer and return a list of uu handles."
+(defun mm-uu-dissect (&optional noheader mime-type)
+ "Dissect the current buffer and return a list of uu handles.
+The optional NOHEADER means there's no header in the buffer.
+MIME-TYPE specifies a MIME type and parameters, which defaults to the
+value of `mm-uu-text-plain-type'."
(let ((case-fold-search t)
- text-start start-point end-point file-name result
- text-plain-type entry func)
+ (mm-uu-text-plain-type (or mime-type mm-uu-text-plain-type))
+ text-start start-point end-point file-name result entry func)
(save-excursion
(goto-char (point-min))
(cond
+ (noheader)
((looking-at "\n")
(forward-line))
((search-forward "\n\n" nil t)
t)
(t (goto-char (point-max))))
- ;;; gnus-decoded is a fake charset, which means no further
- ;;; decoding.
- (setq text-start (point)
- text-plain-type '("text/plain" (charset . gnus-decoded)))
+ (setq text-start (point))
(while (re-search-forward mm-uu-beginning-regexp nil t)
- (setq start-point (match-beginning 0))
+ (setq start-point (match-beginning 0)
+ entry nil)
(let ((alist mm-uu-type-alist)
(beginning-regexp (match-string 0)))
(while (not entry)
@@ -488,7 +492,7 @@ Return that buffer."
(re-search-forward "." start-point t)))
(push
(mm-make-handle (mm-uu-copy-to-buffer text-start start-point)
- text-plain-type)
+ mm-uu-text-plain-type)
result))
(push
(funcall (mm-uu-function-extract entry))
@@ -501,10 +505,72 @@ Return that buffer."
(re-search-forward "." nil t)))
(push
(mm-make-handle (mm-uu-copy-to-buffer text-start (point-max))
- text-plain-type)
+ mm-uu-text-plain-type)
result))
(setq result (cons "multipart/mixed" (nreverse result))))
result)))
+
+;;;###autoload
+(defun mm-uu-dissect-text-parts (handle &optional decoded)
+ "Dissect text parts and put uu handles into HANDLE.
+Assume text has been decoded if DECODED is non-nil."
+ (let ((buffer (mm-handle-buffer handle)))
+ (cond ((stringp buffer)
+ (dolist (elem (cdr handle))
+ (mm-uu-dissect-text-parts elem decoded)))
+ ((bufferp buffer)
+ (let ((type (mm-handle-media-type handle))
+ (case-fold-search t) ;; string-match
+ children charset encoding)
+ (when (and
+ (stringp type)
+ ;; Mutt still uses application/pgp even though
+ ;; it has already been withdrawn.
+ (string-match "\\`text/\\|\\`application/pgp\\'" type)
+ (setq
+ children
+ (with-current-buffer buffer
+ (cond
+ ((or decoded
+ (eq (setq charset (mail-content-type-get
+ (mm-handle-type handle)
+ 'charset))
+ 'gnus-decoded))
+ (setq decoded t)
+ (mm-uu-dissect
+ t (cons type '((charset . gnus-decoded)))))
+ (charset
+ (setq decoded t)
+ (mm-with-multibyte-buffer
+ (insert (mm-decode-string (mm-get-part handle)
+ charset))
+ (mm-uu-dissect
+ t (cons type '((charset . gnus-decoded))))))
+ ((setq encoding (mm-handle-encoding handle))
+ (setq decoded nil)
+ ;; Inherit the multibyteness of the `buffer'.
+ (with-temp-buffer
+ (insert-buffer-substring buffer)
+ (mm-decode-content-transfer-encoding
+ encoding type)
+ (mm-uu-dissect t (list type))))
+ (t
+ (setq decoded nil)
+ (mm-uu-dissect t (list type)))))))
+ ;; Ignore it if a given part is dissected into a single
+ ;; part of which the type is the same as the given one.
+ (if (and (<= (length children) 2)
+ (string-equal (mm-handle-media-type (cadr children))
+ type))
+ (kill-buffer (mm-handle-buffer (cadr children)))
+ (kill-buffer buffer)
+ (setcdr handle (cdr children))
+ (setcar handle (car children)) ;; "multipart/mixed"
+ (dolist (elem (cdr children))
+ (mm-uu-dissect-text-parts elem decoded))))))
+ (t
+ (dolist (elem handle)
+ (mm-uu-dissect-text-parts elem decoded))))))
(provide 'mm-uu)
1.8 +80 -18 XEmacs/packages/xemacs-packages/gnus/lisp/mm-view.el
Index: mm-view.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mm-view.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mm-view.el 2005/12/19 13:35:25 1.7
+++ mm-view.el 2006/03/16 04:17:59 1.8
@@ -1,7 +1,7 @@
;;; mm-view.el --- functions for viewing MIME objects
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; This file is part of GNU Emacs.
@@ -51,8 +51,7 @@
(defvar mm-text-html-renderer-alist
'((w3 . mm-inline-text-html-render-with-w3)
(w3m . mm-inline-text-html-render-with-w3m)
- (w3m-standalone mm-inline-render-with-stdin nil
- "w3m" "-dump" "-T" "text/html")
+ (w3m-standalone . mm-inline-text-html-render-with-w3m-standalone)
(links mm-inline-render-with-file
mm-links-remove-leading-blank
"links" "-dump" file)
@@ -64,8 +63,7 @@
(defvar mm-text-html-washer-alist
'((w3 . gnus-article-wash-html-with-w3)
(w3m . gnus-article-wash-html-with-w3m)
- (w3m-standalone mm-inline-wash-with-stdin nil
- "w3m" "-dump" "-T" "text/html")
+ (w3m-standalone . gnus-article-wash-html-with-w3m-standalone)
(links mm-inline-wash-with-file
mm-links-remove-leading-blank
"links" "-dump" file)
@@ -74,6 +72,12 @@
(html2text html2text))
"The attributes of washer types for text/html.")
+(defcustom mm-fill-flowed t
+ "If non-nil an format=flowed article will be displayed flowed."
+:type 'boolean
+:version "22.1"
+:group 'mime-display)
+
;;; Internal variables.
;;;
@@ -209,21 +213,25 @@
(defun mm-w3m-cid-retrieve-1 (url handle)
(dolist (elem handle)
- (when (listp elem)
- (if (equal url (mm-handle-id elem))
- (progn
- (mm-insert-part elem)
- (throw 'found-handle (mm-handle-media-type elem))))
- (if (equal "multipart" (mm-handle-media-supertype elem))
- (mm-w3m-cid-retrieve-1 url elem)))))
+ (when (consp elem)
+ (when (equal url (mm-handle-id elem))
+ (mm-insert-part elem)
+ (throw 'found-handle (mm-handle-media-type elem)))
+ (when (and (stringp (car elem))
+ (equal "multipart" (mm-handle-media-supertype elem)))
+ (mm-w3m-cid-retrieve-1 url elem)))))
(defun mm-w3m-cid-retrieve (url &rest args)
"Insert a content pointed by URL if it has the cid: scheme."
(when (string-match "\\`cid:" url)
- (catch 'found-handle
- (mm-w3m-cid-retrieve-1 (concat "<" (substring url (match-end 0))
">")
- (with-current-buffer w3m-current-buffer
- gnus-article-mime-handles)))))
+ (or (catch 'found-handle
+ (mm-w3m-cid-retrieve-1
+ (setq url (concat "<" (substring url (match-end 0)) ">"))
+ (with-current-buffer w3m-current-buffer
+ gnus-article-mime-handles)))
+ (prog1
+ nil
+ (message "Failed to find \"Content-ID: %s\"" url)))))
(defun mm-inline-text-html-render-with-w3m (handle)
"Render a text/html part using emacs-w3m."
@@ -264,6 +272,58 @@
(delete-region ,(point-min-marker)
,(point-max-marker)))))))))
+(defvar mm-w3m-standalone-supports-m17n-p (if (featurep 'mule) 'undecided)
+ "*T means the w3m command supports the m17n feature.")
+
+(defun mm-w3m-standalone-supports-m17n-p ()
+ "Say whether the w3m command supports the m17n feature."
+ (cond ((eq mm-w3m-standalone-supports-m17n-p t) t)
+ ((eq mm-w3m-standalone-supports-m17n-p nil) nil)
+ ((not (featurep 'mule)) (setq mm-w3m-standalone-supports-m17n-p nil))
+ ((condition-case nil
+ (let ((coding-system-for-write 'iso-2022-jp)
+ (coding-system-for-read 'iso-2022-jp)
+ (str (mm-decode-coding-string "\
+\e$B#D#o#e#s!!#w#3#m!!#s#u#p#p#o#r#t#s!!#m#1#7#n!)\e(B" 'iso-2022-jp)))
+ (mm-with-multibyte-buffer
+ (insert str)
+ (call-process-region
+ (point-min) (point-max) "w3m" t t nil "-dump"
+ "-T" "text/html" "-I" "iso-2022-jp"
"-O" "iso-2022-jp")
+ (goto-char (point-min))
+ (search-forward str nil t)))
+ (error nil))
+ (setq mm-w3m-standalone-supports-m17n-p t))
+ (t
+ ;;(message "You had better upgrade your w3m command")
+ (setq mm-w3m-standalone-supports-m17n-p nil))))
+
+(defun mm-inline-text-html-render-with-w3m-standalone (handle)
+ "Render a text/html part using w3m."
+ (if (mm-w3m-standalone-supports-m17n-p)
+ (let ((source (mm-get-part handle))
+ (charset (mail-content-type-get (mm-handle-type handle) 'charset))
+ cs)
+ (unless (and charset
+ (setq cs (mm-charset-to-coding-system charset))
+ (not (eq cs 'ascii)))
+ ;; The default.
+ (setq charset "iso-8859-1"
+ cs 'iso-8859-1))
+ (mm-insert-inline
+ handle
+ (mm-with-unibyte-buffer
+ (insert source)
+ (mm-enable-multibyte)
+ (let ((coding-system-for-write 'binary)
+ (coding-system-for-read cs))
+ (call-process-region
+ (point-min) (point-max)
+ "w3m" t t nil "-dump" "-T" "text/html"
+ "-I" charset "-O" charset))
+ (buffer-string))))
+ (mm-inline-render-with-stdin handle nil "w3m" "-dump"
"-T" "text/html")))
+
(defun mm-links-remove-leading-blank ()
;; Delete the annoying three spaces preceding each line of links
;; output.
@@ -357,7 +417,8 @@
(mm-insert-part handle)
(goto-char (point-max)))
(insert (mm-decode-string (mm-get-part handle) charset)))
- (when (and (equal type "plain")
+ (when (and mm-fill-flowed
+ (equal type "plain")
(equal (cdr (assoc 'format (mm-handle-type handle)))
"flowed"))
(save-restriction
@@ -436,7 +497,8 @@
;; disable prepare hook
gnus-article-prepare-hook
(gnus-newsgroup-charset
- (or charset gnus-newsgroup-charset)))
+ (unless (eq charset 'gnus-decoded) ;; mm-uu might set it.
+ (or charset gnus-newsgroup-charset))))
(let ((gnus-original-article-buffer (mm-handle-buffer handle)))
(run-hooks 'gnus-article-decode-hook))
(gnus-article-prepare-display)
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/mml-sec.el
Index: mml-sec.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mml-sec.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mml-sec.el 2005/11/15 03:45:54 1.5
+++ mml-sec.el 2006/03/16 04:17:59 1.6
@@ -1,7 +1,7 @@
;;; mml-sec.el --- A package with security functions for MML documents
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon(a)josefsson.org>
1.8 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/mml-smime.el
Index: mml-smime.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mml-smime.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mml-smime.el 2005/11/15 03:45:54 1.7
+++ mml-smime.el 2006/03/16 04:17:59 1.8
@@ -1,7 +1,7 @@
;;; mml-smime.el --- S/MIME support for MML
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon(a)josefsson.org>
;; Keywords: Gnus, MIME, S/MIME, MML
1.7 +48 -19 XEmacs/packages/xemacs-packages/gnus/lisp/mml.el
Index: mml.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mml.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mml.el 2005/11/15 03:45:54 1.6
+++ mml.el 2006/03/16 04:17:59 1.7
@@ -1,7 +1,7 @@
;;; mml.el --- A package for parsing and validating MML documents
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; This file is part of GNU Emacs.
@@ -38,6 +38,7 @@
(autoload 'gnus-add-minor-mode "gnus-ems")
(autoload 'gnus-make-local-hook "gnus-util")
(autoload 'message-fetch-field "message")
+ (autoload 'message-info "message")
(autoload 'fill-flowed-encode "flow-fill")
(autoload 'message-posting-charset "message"))
@@ -506,7 +507,15 @@ If MML is non-nil, return the buffer up
(let ((coding-system-for-read mm-binary-coding-system))
(mm-insert-file-contents filename nil nil nil nil t)))
(t
- (insert (cdr (assq 'contents cont)))))
+ (let ((contents (cdr (assq 'contents cont))))
+ (if (if (featurep 'xemacs)
+ (string-match "[^\000-\377]" contents)
+ (mm-multibyte-string-p contents))
+ (progn
+ (mm-enable-multibyte)
+ (insert contents)
+ (setq charset (mm-encode-body)))
+ (insert contents)))))
(setq encoding (mm-encode-buffer type)
coded (mm-string-as-multibyte (buffer-string))))
(mml-insert-mime-headers cont type charset encoding nil)
@@ -577,7 +586,8 @@ If MML is non-nil, return the buffer up
;; Skip `multipart' and attributes.
(when (and (consp part) (consp (cdr part)))
(insert "\n--" mml-boundary "\n")
- (mml-generate-mime-1 part))))
+ (mml-generate-mime-1 part)
+ (goto-char (point-max)))))
(insert "\n--" mml-boundary "--\n")))))
(t
(error "Invalid element: %S" cont)))
@@ -662,10 +672,10 @@ If MML is non-nil, return the buffer up
"Can't encode a part with several charsets"))
(insert "Content-Type: " type)
(when charset
- (insert "; " (mail-header-encode-parameter
- "charset" (symbol-name charset))))
+ (mml-insert-parameter
+ (mail-header-encode-parameter "charset" (symbol-name charset))))
(when flowed
- (insert "; format=flowed"))
+ (mml-insert-parameter "format=flowed"))
(when parameters
(mml-insert-parameter-string
cont mml-content-type-parameters))
@@ -685,8 +695,11 @@ If MML is non-nil, return the buffer up
(unless (eq encoding '7bit)
(insert (format "Content-Transfer-Encoding: %s\n" encoding)))
(when (setq description (cdr (assq 'description cont)))
- (insert "Content-Description: "
- (mail-encode-encoded-word-string description) "\n"))))
+ (insert "Content-Description: ")
+ (setq description (prog1
+ (point)
+ (insert description "\n")))
+ (mail-encode-encoded-word-region description (point)))))
(defun mml-parameter-string (cont types)
(let ((string "")
@@ -839,14 +852,20 @@ If HANDLES is non-nil, use it instead re
(defun mml-insert-parameter (&rest parameters)
"Insert PARAMETERS in a nice way."
- (dolist (param parameters)
- (insert ";")
- (let ((point (point)))
+ (let (start end)
+ (dolist (param parameters)
+ (insert ";")
+ (setq start (point))
(insert " " param)
- (when (> (current-column) 71)
- (goto-char point)
- (insert "\n ")
- (end-of-line)))))
+ (setq end (point))
+ (goto-char start)
+ (end-of-line)
+ (if (> (current-column) 76)
+ (progn
+ (goto-char start)
+ (insert "\n")
+ (goto-char (1+ end)))
+ (goto-char end)))))
;;;
;;; Mode for inserting and editing MML forms
@@ -917,7 +936,14 @@ If HANDLES is non-nil, use it instead re
;;["Narrow" mml-narrow-to-part t]
["Quote MML" mml-quote-region t]
["Validate MML" mml-validate t]
- ["Preview" mml-preview t]))
+ ["Preview" mml-preview t]
+ "----"
+ ["Emacs MIME manual" (lambda () (interactive) (message-info 4))
+ ,@(if (featurep 'xemacs) '(t)
+ '(:help "Display the Emacs MIME manual"))]
+ ["PGG manual" (lambda () (interactive) (message-info 16))
+ ,@(if (featurep 'xemacs) '(t)
+ '(:help "Display the PGG manual"))]))
(defvar mml-mode nil
"Minor mode for editing MML.")
@@ -1036,9 +1062,12 @@ See Info node `(emacs-mime)Composing'.
The file is not inserted or encoded until you send the message with
`\\[message-send-and-exit]' or `\\[message-send]'.
-FILE is the name of the file to attach. TYPE is its content-type, a
-string of the form \"type/subtype\". DESCRIPTION is a one-line
-description of the attachment."
+FILE is the name of the file to attach. TYPE is its
+content-type, a string of the form \"type/subtype\". DESCRIPTION
+is a one-line description of the attachment. The DISPOSITION
+specifies how the attachment is intended to be displayed. It can
+be either \"inline\" (displayed automatically within the message
+body) or \"attachment\" (separate from the body)."
(interactive
(let* ((file (mml-minibuffer-read-file "Attach file: "))
(type (mml-minibuffer-read-type file))
1.6 +5 -3 XEmacs/packages/xemacs-packages/gnus/lisp/mml1991.el
Index: mml1991.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mml1991.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mml1991.el 2005/11/15 03:45:55 1.5
+++ mml1991.el 2006/03/16 04:18:00 1.6
@@ -1,7 +1,7 @@
;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Sascha Lüdecke <sascha(a)meta-x.de>,
;; Simon Josefsson <simon(a)josefsson.org> (Mailcrypt interface, Gnus glue)
@@ -229,7 +229,8 @@
(defvar pgg-output-buffer))
(defun mml1991-pgg-sign (cont)
- (let (headers cte)
+ (let ((pgg-text-mode t)
+ headers cte)
;; Don't sign headers.
(goto-char (point-min))
(while (not (looking-at "^$"))
@@ -261,7 +262,8 @@
t))
(defun mml1991-pgg-encrypt (cont &optional sign)
- (let (cte)
+ (let ((pgg-text-mode t)
+ cte)
;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
(goto-char (point-min))
(while (looking-at "^Content[^ ]+:")
1.7 +3 -1 XEmacs/packages/xemacs-packages/gnus/lisp/mml2015.el
Index: mml2015.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mml2015.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mml2015.el 2005/11/15 03:45:55 1.6
+++ mml2015.el 2006/03/16 04:18:00 1.7
@@ -1,7 +1,7 @@
;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh(a)cs.rochester.edu>
;; Keywords: PGP MIME MML
@@ -814,6 +814,7 @@
(boundary (mml-compute-boundary cont))
(pgg-default-user-id (or (message-options-get 'mml-sender)
pgg-default-user-id))
+ (pgg-text-mode t)
entry)
(unless (pgg-sign-region (point-min) (point-max))
(pop-to-buffer mml2015-result-buffer)
@@ -841,6 +842,7 @@
(defun mml2015-pgg-encrypt (cont &optional sign)
(let ((pgg-errors-buffer mml2015-result-buffer)
+ (pgg-text-mode t)
(boundary (mml-compute-boundary cont)))
(unless (pgg-encrypt-region (point-min) (point-max)
(split-string
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nnagent.el
Index: nnagent.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnagent.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nnagent.el 2005/11/15 03:45:55 1.5
+++ nnagent.el 2006/03/16 04:18:00 1.6
@@ -1,7 +1,7 @@
;;; nnagent.el --- offline backend for Gnus
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news, mail
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nnbabyl.el
Index: nnbabyl.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnbabyl.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nnbabyl.el 2005/11/15 03:45:55 1.5
+++ nnbabyl.el 2006/03/16 04:18:00 1.6
@@ -1,7 +1,7 @@
;;; nnbabyl.el --- rmail mbox access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1099, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Masanobu UMEDA <umerin(a)flab.flab.fujitsu.junet>
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nndb.el
Index: nndb.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nndb.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nndb.el 2005/11/15 03:45:55 1.4
+++ nndb.el 2006/03/16 04:18:01 1.5
@@ -1,7 +1,7 @@
;;; nndb.el --- nndb access for Gnus
;; Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin(a)flab.flab.fujitsu.junet>
;; Kai Grossjohann <grossjohann(a)ls6.informatik.uni-dortmund.de>
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nndiary.el
Index: nndiary.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nndiary.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nndiary.el 2005/11/15 03:45:55 1.5
+++ nndiary.el 2006/03/16 04:18:01 1.6
@@ -1,7 +1,7 @@
;;; nndiary.el --- A diary backend for Gnus
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Didier Verna <didier(a)xemacs.org>
;; Maintainer: Didier Verna <didier(a)xemacs.org>
1.4 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nndir.el
Index: nndir.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nndir.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nndir.el 2005/11/15 03:45:55 1.3
+++ nndir.el 2006/03/16 04:18:01 1.4
@@ -1,7 +1,7 @@
;;; nndir.el --- single directory newsgroup access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.7 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nndoc.el
Index: nndoc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nndoc.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nndoc.el 2005/11/15 03:45:55 1.6
+++ nndoc.el 2006/03/16 04:18:01 1.7
@@ -1,7 +1,7 @@
;;; nndoc.el --- single file access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Masanobu UMEDA <umerin(a)flab.flab.fujitsu.junet>
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nndraft.el
Index: nndraft.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nndraft.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nndraft.el 2005/11/15 03:45:56 1.5
+++ nndraft.el 2006/03/16 04:18:01 1.6
@@ -1,7 +1,7 @@
;;; nndraft.el --- draft article access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nneething.el
Index: nneething.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nneething.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nneething.el 2005/11/15 03:45:56 1.4
+++ nneething.el 2006/03/16 04:18:02 1.5
@@ -1,7 +1,7 @@
;;; nneething.el --- arbitrary file access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Masanobu UMEDA <umerin(a)flab.flab.fujitsu.junet>
1.7 +2 -2 XEmacs/packages/xemacs-packages/gnus/lisp/nnfolder.el
Index: nnfolder.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnfolder.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nnfolder.el 2005/11/15 03:45:56 1.6
+++ nnfolder.el 2006/03/16 04:18:02 1.7
@@ -1,7 +1,7 @@
;;; nnfolder.el --- mail folder access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon(a)josefsson.org> (adding MARKS)
;; ShengHuo Zhu <zsh(a)cs.rochester.edu> (adding NOV)
@@ -826,7 +826,7 @@ deleted. Point is left where the delete
(insert "\n"))
(forward-char -1)
(insert (format (concat nnfolder-article-marker "%d %s\n")
- (cdr group-art) (current-time-string)))))
+ (cdr group-art) (message-make-date)))))
(defun nnfolder-active-number (group)
;; Find the next article number in GROUP.
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nngateway.el
Index: nngateway.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nngateway.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nngateway.el 2005/11/15 03:45:56 1.4
+++ nngateway.el 2006/03/16 04:18:02 1.5
@@ -1,7 +1,7 @@
;;; nngateway.el --- posting news via mail gateways
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news, mail
1.8 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nnheader.el
Index: nnheader.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnheader.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nnheader.el 2005/11/15 03:45:56 1.7
+++ nnheader.el 2006/03/16 04:18:02 1.8
@@ -2,7 +2,7 @@
;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994,
;; 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin(a)flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi(a)gnus.org>
1.7 +2 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nnimap.el
Index: nnimap.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnimap.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nnimap.el 2005/11/15 03:45:56 1.6
+++ nnimap.el 2006/03/16 04:18:02 1.7
@@ -1,7 +1,7 @@
;;; nnimap.el --- imap backend for Gnus
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <jas(a)pdc.kth.se>
;; Jim Radford <radford(a)robby.caltech.edu>
@@ -1492,6 +1492,7 @@ function is generally only called when G
(setq result (eval accept-form))
(kill-buffer buf)
result)
+ (nnimap-possibly-change-group group server)
(imap-message-flags-add
(imap-range-to-message-set (list article))
"\\Deleted" 'silent nnimap-server-buffer))
1.3 +14 -13 XEmacs/packages/xemacs-packages/gnus/lisp/nnir.el
Index: nnir.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnir.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nnir.el 2005/11/15 03:45:56 1.2
+++ nnir.el 2006/03/16 04:18:03 1.3
@@ -690,18 +690,8 @@ that it is for Namazu, not Glimpse."
'gnus-group-make-nnir-group))
(add-hook 'gnus-group-mode-hook 'nnir-group-mode-hook)
-(defmacro nnir-group-server (group)
- "Return the server for a foreign newsgroup GROUP.
-The returned format is as `gnus-server-to-method' needs it. See
-`gnus-group-real-prefix' and `gnus-group-real-name'."
- `(let ((gname ,group))
- (if (string-match "^\\([^:]+\\):" gname)
- (setq gname (match-string 1 gname))
- nil)
- (if (string-match "^\\([^+]+\\)\\+\\(.+\\)$" gname)
- (format "%s:%s" (match-string 1 gname) (match-string 2 gname))
- (concat gname ":"))))
+
;; Summary mode commands.
(defun gnus-summary-nnir-goto-thread ()
@@ -873,7 +863,7 @@ pairs (also vectors, actually)."
(let ((artlist nil)
(groupspec (cdr (assq 'group query)))
(qstring (cdr (assq 'query query)))
- (prefix (nnir-read-server-parm 'nnir-glimpse-remove-prefix server))
+ (prefix (nnir-read-server-parm 'nnir-glimps-remove-prefix server))
artno dirnam)
(when (and group groupspec)
(error (concat "It does not make sense to use a group spec"
@@ -1202,7 +1192,7 @@ Tested with swish-e-2.0.1 on Windows NT
(error "Missing parameter `nnir-swish-e-index-file'")))
(additional-switches
(nnir-read-server-parm
- 'nnir-swish-e-additional-switches server))
+ 'nnir-swish++-additional-switches server))
(cp-list `(,nnir-swish-e-program
nil ; input from /dev/null
t ; output
@@ -1493,6 +1483,17 @@ form 'backend:name'."
;; (symbol-value key))
;; (symbol-value key))
;; ))
+
+(defmacro nnir-group-server (group)
+ "Returns the server for a foreign newsgroup in the format as gnus-server-to-method
needs it. Compare to gnus-group-real-prefix and gnus-group-real-name."
+ `(let ((gname ,group))
+ (if (string-match "^\\([^:]+\\):" gname)
+ (setq gname (match-string 1 gname))
+ nil)
+ (if (string-match "^\\([^+]+\\)\\+\\(.+\\)$" gname)
+ (format "%s:%s" (match-string 1 gname) (match-string 2 gname))
+ (concat gname ":"))
+ ))
(defun nnir-group-full-name (shortname server)
"For the given group name, return a full Gnus group name.
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nnkiboze.el
Index: nnkiboze.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnkiboze.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nnkiboze.el 2005/11/15 03:45:57 1.4
+++ nnkiboze.el 2006/03/16 04:18:03 1.5
@@ -1,7 +1,7 @@
;;; nnkiboze.el --- select virtual news access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nnlistserv.el
Index: nnlistserv.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnlistserv.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nnlistserv.el 2005/11/15 03:45:57 1.4
+++ nnlistserv.el 2006/03/16 04:18:03 1.5
@@ -1,7 +1,7 @@
;;; nnlistserv.el --- retrieving articles via web mailing list archives
;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news, mail
1.8 +15 -8 XEmacs/packages/xemacs-packages/gnus/lisp/nnmail.el
Index: nnmail.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnmail.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nnmail.el 2005/12/19 13:35:26 1.7
+++ nnmail.el 2006/03/16 04:18:03 1.8
@@ -1,7 +1,7 @@
;;; nnmail.el --- mail support functions for the Gnus mail backends
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news, mail
@@ -1425,11 +1425,12 @@ See the documentation for the variable `
;; Not in cache, compute a regexp for the field/value pair.
(t
- (let* ((field (nth 0 split))
- (value (nth 1 split))
- partial-front
- partial-rear
- regexp)
+ (let ((field (nth 0 split))
+ (value (nth 1 split))
+ (split-rest (cddr split))
+ partial-front
+ partial-rear
+ regexp)
(if (symbolp value)
(setq value (cdr (assq value nnmail-split-abbrev-alist))))
(if (and (>= (length value) 2)
@@ -1441,7 +1442,13 @@ See the documentation for the variable `
(string= ".*" (substring value -2)))
(setq value (substring value 0 -2)
partial-rear ""))
- (when nnmail-split-fancy-match-partial-words
+ ;; Invert the match-partial-words behavior if the optional
+ ;; last element is specified.
+ (while (eq (car split-rest) '-)
+ (setq split-rest (cddr split-rest)))
+ (when (if (cadr split-rest)
+ (not nnmail-split-fancy-match-partial-words)
+ nnmail-split-fancy-match-partial-words)
(setq partial-front ""
partial-rear ""))
(setq regexp (concat "^\\(\\("
@@ -1456,7 +1463,7 @@ See the documentation for the variable `
(or partial-rear "\\>")))
(push (cons split regexp) nnmail-split-cache)
;; Now that it's in the cache, just call nnmail-split-it again
- ;; on the same split, which will find it immediately in the cache.
+ ;; on the same split, which will find it immediately in the cache.
(nnmail-split-it split))))))
(defun nnmail-expand-newtext (newtext)
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nnmbox.el
Index: nnmbox.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnmbox.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nnmbox.el 2005/11/15 03:45:57 1.5
+++ nnmbox.el 2006/03/16 04:18:03 1.6
@@ -1,7 +1,7 @@
;;; nnmbox.el --- mail mbox access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Masanobu UMEDA <umerin(a)flab.flab.fujitsu.junet>
1.6 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nnmh.el
Index: nnmh.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnmh.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nnmh.el 2005/11/15 03:45:57 1.5
+++ nnmh.el 2006/03/16 04:18:04 1.6
@@ -1,7 +1,7 @@
;;; nnmh.el --- mhspool access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Masanobu UMEDA <umerin(a)flab.flab.fujitsu.junet>
1.7 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nnml.el
Index: nnml.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnml.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nnml.el 2005/11/15 03:45:57 1.6
+++ nnml.el 2006/03/16 04:18:04 1.7
@@ -1,7 +1,7 @@
;;; nnml.el --- mail spool access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon(a)josefsson.org> (adding MARKS)
;; Lars Magne Ingebrigtsen <larsi(a)gnus.org>
1.5 +11 -7 XEmacs/packages/xemacs-packages/gnus/lisp/nnoo.el
Index: nnoo.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnoo.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nnoo.el 2005/11/15 03:45:58 1.4
+++ nnoo.el 2006/03/16 04:18:04 1.5
@@ -1,7 +1,7 @@
;;; nnoo.el --- OO Gnus Backends
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
@@ -61,12 +61,16 @@
(defmacro nnoo-declare (backend &rest parents)
`(eval-and-compile
- (push (list ',backend
- (mapcar (lambda (p) (list p)) ',parents)
- nil nil)
- nnoo-definition-alist)
- (push (list ',backend "*internal-non-initialized-backend*")
- nnoo-state-alist)))
+ (if (assq ',backend nnoo-definition-alist)
+ (setcar (cdr (assq ',backend nnoo-definition-alist))
+ (mapcar 'list ',parents))
+ (push (list ',backend
+ (mapcar 'list ',parents)
+ nil nil)
+ nnoo-definition-alist))
+ (unless (assq ',backend nnoo-state-alist)
+ (push (list ',backend "*internal-non-initialized-backend*")
+ nnoo-state-alist))))
(put 'nnoo-declare 'lisp-indent-function 1)
(defun nnoo-parents (backend)
1.8 +145 -32 XEmacs/packages/xemacs-packages/gnus/lisp/nnrss.el
Index: nnrss.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnrss.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nnrss.el 2006/01/04 07:05:30 1.7
+++ nnrss.el 2006/03/16 04:18:04 1.8
@@ -1,6 +1,7 @@
;;; nnrss.el --- interfacing with RSS
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh(a)cs.rochester.edu>
;; Keywords: RSS
@@ -87,9 +88,14 @@ ARTICLE is the article number of the cur
(defvar nnrss-compatible-encoding-alist '((iso-8859-1 . windows-1252))
"Alist of encodings and those supersets.
The cdr of each element is used to decode data if it is available when
-the car is what the data specify as the encoding. Or, the car is used
+the car is what the data specify as the encoding. Or, the car is used
for decoding when the cdr that the data specify is not available.")
+(defvar nnrss-wash-html-in-text-plain-parts nil
+ "*Non-nil means render text in text/plain parts as HTML.
+The function specified by the `mm-text-html-renderer' variable will be
+used to render text. If it is nil, text will simply be folded.")
+
(nnoo-define-basics nnrss)
;;; Interface functions
@@ -169,6 +175,10 @@ for decoding when the cdr that the data
(deffoo nnrss-close-group (group &optional server)
t)
+(eval-when-compile
+ (defvar mm-text-html-renderer)
+ (defvar mm-text-html-washer-alist))
+
(deffoo nnrss-request-article (article &optional group server buffer)
(setq group (nnrss-decode-group-name group))
(when (stringp article)
@@ -191,10 +201,7 @@ for decoding when the cdr that the data
(if (nth 5 e)
(insert "Date: " (nnrss-format-string (nth 5 e)) "\n"))
(let ((header (buffer-string))
- (text (if (nth 6 e)
- (mapconcat 'identity
- (delete "" (split-string (nth 6 e) "\n+"))
- " ")))
+ (text (nth 6 e))
(link (nth 2 e))
(enclosure (nth 7 e))
(comments (nth 8 e))
@@ -205,7 +212,7 @@ for decoding when the cdr that the data
(cons '("Newsgroups" . utf-8)
rfc2047-header-encoding-alist)
rfc2047-header-encoding-alist))
- rfc2047-encode-encoded-words body)
+ rfc2047-encode-encoded-words body fn)
(when (or text link enclosure comments)
(insert "\n")
(insert "<#multipart type=alternative>\n"
@@ -214,23 +221,46 @@ for decoding when the cdr that the data
(when text
(insert text)
(goto-char body)
- ;; See `nnrss-check-group', which inserts "<br /><br
/>".
- (if (search-forward "<br /><br />" nil t)
+ (if (and nnrss-wash-html-in-text-plain-parts
+ (progn
+ (require 'mm-view)
+ (setq fn (or (cdr (assq mm-text-html-renderer
+ mm-text-html-washer-alist))
+ mm-text-html-renderer))))
+ (progn
+ (narrow-to-region body (point-max))
+ (if (functionp fn)
+ (funcall fn)
+ (apply (car fn) (cdr fn)))
+ (widen)
+ (goto-char body)
+ (re-search-forward "[^\t\n ]" nil t)
+ (beginning-of-line)
+ (delete-region body (point))
+ (goto-char (point-max))
+ (skip-chars-backward "\t\n ")
+ (end-of-line)
+ (delete-region (point) (point-max))
+ (insert "\n"))
+ (while (re-search-forward "\n+" nil t)
+ (replace-match " "))
+ (goto-char body)
+ ;; See `nnrss-check-group', which inserts "<br /><br />".
+ (when (search-forward "<br /><br />" nil t)
(if (eobp)
(replace-match "\n")
- (replace-match "\n\n")
- (let ((fill-column default-fill-column)
- (window (get-buffer-window nntp-server-buffer)))
- (when window
- (setq fill-column
- (max 1 (/ (* (window-width window) 7) 8))))
- (fill-region (point) (point-max))
- (goto-char (point-max))
- ;; XEmacs version of `fill-region' inserts newline.
- (unless (bolp)
- (insert "\n"))))
- (goto-char (point-max))
- (insert "\n"))
+ (replace-match "\n\n")))
+ (unless (eobp)
+ (let ((fill-column default-fill-column)
+ (window (get-buffer-window nntp-server-buffer)))
+ (when window
+ (setq fill-column
+ (max 1 (/ (* (window-width window) 7) 8))))
+ (fill-region (point) (point-max))
+ (goto-char (point-max))
+ ;; XEmacs version of `fill-region' inserts newline.
+ (unless (bolp)
+ (insert "\n")))))
(when (or link enclosure)
(insert "\n")))
(when link
@@ -436,6 +466,74 @@ nnrss: %s: Not valid XML %s and w3-parse
(unless (assoc (car elem) nnrss-group-alist)
(insert (prin1-to-string (car elem)) " 0 1 y\n")))))
+(eval-and-compile (autoload 'timezone-parse-date "timezone"))
+
+(defun nnrss-normalize-date (date)
+ "Return a date string of DATE in the RFC822 style.
+This function handles the ISO 8601 date format described in
+<URL:http://www.w3.org/TR/NOTE-datetime>, and also the RFC822 style
+which RSS 2.0 allows."
+ (let (case-fold-search vector year month day time zone cts)
+ (cond ((null date))
+ ;; RFC822
+ ((string-match " [0-9]+ " date)
+ (setq vector (timezone-parse-date date)
+ year (string-to-number (aref vector 0)))
+ (when (>= year 1969)
+ (setq month (string-to-number (aref vector 1))
+ day (string-to-number (aref vector 2)))
+ (unless (>= (length (setq time (aref vector 3))) 3)
+ (setq time "00:00:00"))
+ (when (and (setq zone (aref vector 4))
+ (not (string-match "\\`[A-Z+-]" zone)))
+ (setq zone nil))))
+ ;; ISO 8601
+ ((string-match
+ (eval-when-compile
+ (concat
+ ;; 1. year
+ "\\(199[0-9]\\|20[0-9][0-9]\\)"
+ "\\(-"
+ ;; 3. month
+ "\\([01][0-9]\\)"
+ "\\(-"
+ ;; 5. day
+ "\\([0-3][0-9]\\)"
+ "\\)?\\)?\\(T"
+ ;; 7. hh:mm
+ "\\([012][0-9]:[0-5][0-9]\\)"
+ "\\("
+ ;; 9. :ss
+ "\\(:[0-5][0-9]\\)"
+ "\\(\\.[0-9]+\\)?\\)?\\)?"
+ ;; 13+14,15,16. zone
+ "\\(\\(\\([+-][012][0-9]\\):\\([0-5][0-9]\\)\\)"
+ "\\|\\([+-][012][0-9][0-5][0-9]\\)"
+ "\\|\\(Z\\)\\)?"))
+ date)
+ (setq year (string-to-number (match-string 1 date))
+ month (string-to-number (or (match-string 3 date) "1"))
+ day (string-to-number (or (match-string 5 date) "1"))
+ time (if (match-beginning 9)
+ (substring date (match-beginning 7) (match-end 9))
+ (concat (or (match-string 7 date) "00:00") ":00"))
+ zone (cond ((match-beginning 13)
+ (concat (match-string 13 date)
+ (match-string 14 date)))
+ ((match-beginning 16) ;; Z
+ "+0000")
+ (t ;; nil if zone is not provided.
+ (match-string 15 date))))))
+ (if month
+ (progn
+ (setq cts (current-time-string (encode-time 0 0 0 day month year)))
+ (format "%s, %02d %s %04d %s%s"
+ (substring cts 0 3) day (substring cts 4 7) year time
+ (if zone
+ (concat " " zone)
+ "")))
+ (message-make-date))))
+
;;; data functions
(defun nnrss-read-server-data (server)
@@ -606,9 +704,9 @@ nnrss: %s: Not valid XML %s and w3-parse
(setq author (or (nnrss-node-text rss-ns 'author item)
(nnrss-node-text dc-ns 'creator item)
(nnrss-node-text dc-ns 'contributor item)))
- (setq date (or (nnrss-node-text dc-ns 'date item)
- (nnrss-node-text rss-ns 'pubDate item)
- (message-make-date)))
+ (setq date (nnrss-normalize-date
+ (or (nnrss-node-text dc-ns 'date item)
+ (nnrss-node-text rss-ns 'pubDate item))))
(setq comments (nnrss-node-text rss-ns 'comments item))
(when (setq enclosure (cadr (assq (intern (concat rss-ns "enclosure"))
item)))
(let ((url (cdr (assq 'url enclosure)))
@@ -658,14 +756,29 @@ nnrss: %s: Not valid XML %s and w3-parse
"OPML subscriptions import.
Read the file and attempt to subscribe to each Feed in the file."
(interactive "fImport file: ")
- (mapcar
- (lambda (node) (gnus-group-make-rss-group
- (cdr (assq 'xmlUrl (cadr node)))))
+ (mapc
+ (lambda (node)
+ (let ((xmlurl (cdr (assq 'xmlUrl (cadr node)))))
+ (when (and xmlurl
+ (not (string-match "\\`[\t ]*\\'" xmlurl))
+ (prog1
+ (y-or-n-p (format "Subscribe to %s " xmlurl))
+ (message "")))
+ (condition-case err
+ (progn
+ (gnus-group-make-rss-group xmlurl)
+ (forward-line 1))
+ (error
+ (message
+ "Failed to subscribe to %s (%s); type any key to continue: "
+ xmlurl
+ (error-message-string err))
+ (let ((echo-keystrokes 0))
+ (read-char)))))))
(nnrss-find-el 'outline
- (progn
- (find-file opml-file)
- (xml-parse-region (point-min)
- (point-max))))))
+ (mm-with-multibyte-buffer
+ (insert-file-contents opml-file)
+ (xml-parse-region (point-min) (point-max))))))
(defun nnrss-opml-export ()
"OPML subscription export.
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nnslashdot.el
Index: nnslashdot.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnslashdot.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nnslashdot.el 2005/11/15 03:45:58 1.4
+++ nnslashdot.el 2006/03/16 04:18:04 1.5
@@ -1,7 +1,7 @@
;;; nnslashdot.el --- interfacing with Slashdot
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nnsoup.el
Index: nnsoup.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnsoup.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nnsoup.el 2005/11/15 03:45:58 1.4
+++ nnsoup.el 2006/03/16 04:18:04 1.5
@@ -1,7 +1,7 @@
;;; nnsoup.el --- SOUP access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Masanobu UMEDA <umerin(a)flab.flab.fujitsu.junet>
1.7 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nnspool.el
Index: nnspool.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnspool.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nnspool.el 2005/11/15 03:45:58 1.6
+++ nnspool.el 2006/03/16 04:18:05 1.7
@@ -1,7 +1,7 @@
;;; nnspool.el --- spool access for GNU Emacs
;; Copyright (C) 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998,
-;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin(a)flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi(a)gnus.org>
1.8 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nntp.el
Index: nntp.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nntp.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nntp.el 2005/12/19 13:35:26 1.7
+++ nntp.el 2006/03/16 04:18:05 1.8
@@ -2,7 +2,7 @@
;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993,
;; 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nnultimate.el
Index: nnultimate.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnultimate.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nnultimate.el 2005/11/15 03:45:59 1.4
+++ nnultimate.el 2006/03/16 04:18:05 1.5
@@ -1,7 +1,7 @@
;;; nnultimate.el --- interfacing with the Ultimate Bulletin Board system
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nnvirtual.el
Index: nnvirtual.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnvirtual.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nnvirtual.el 2005/11/15 03:45:59 1.4
+++ nnvirtual.el 2006/03/16 04:18:05 1.5
@@ -1,7 +1,7 @@
;;; nnvirtual.el --- virtual newsgroups access for Gnus
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: David Moore <dmoore(a)ucsd.edu>
;; Lars Magne Ingebrigtsen <larsi(a)gnus.org>
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nnwarchive.el
Index: nnwarchive.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnwarchive.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nnwarchive.el 2005/11/15 03:45:59 1.4
+++ nnwarchive.el 2006/03/16 04:18:06 1.5
@@ -1,7 +1,7 @@
;;; nnwarchive.el --- interfacing with web archives
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh(a)cs.rochester.edu>
;; Keywords: news egroups mail-archive
1.7 +113 -96 XEmacs/packages/xemacs-packages/gnus/lisp/nnweb.el
Index: nnweb.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnweb.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nnweb.el 2005/11/15 03:45:59 1.6
+++ nnweb.el 2006/03/16 04:18:06 1.7
@@ -1,7 +1,7 @@
;;; nnweb.el --- retrieving articles via web search engines
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
@@ -27,12 +27,6 @@
;; Note: You need to have `w3' installed for some functions to work.
-;; FIXME: Due to changes in the HTML output of Google Groups and Gmane, stuff
-;; related to web groups (gnus-group-make-web-group) doesn't work anymore.
-
-;; Fetching an article by MID (cf. gnus-refer-article-method) over Google
-;; Groups should work.
-
;;; Code:
(eval-when-compile (require 'cl))
@@ -61,6 +55,7 @@ Valid types include `google', `dejanews'
(defvar nnweb-type-definition
'((google
(id .
"http://www.google.com/groups?as_umsgid=%s&hl=en&dmode=source")
+ (result . "http://groups.google.com/group/%s/msg/%s?dmode=source")
(article . nnweb-google-wash-article)
(reference . identity)
(map . nnweb-google-create-mapping)
@@ -69,8 +64,9 @@ Valid types include `google', `dejanews'
(base . "http://groups.google.com")
(identifier . nnweb-google-identity))
(dejanews ;; alias of google
- (article . ignore)
- (id . "http://groups.google.com/groups?selm=%s&output=gplain")
+ (id .
"http://www.google.com/groups?as_umsgid=%s&hl=en&dmode=source")
+ (result . "http://groups.google.com/group/%s/msg/%s?dmode=source")
+ (article . nnweb-google-wash-article)
(reference . identity)
(map . nnweb-google-create-mapping)
(search . nnweb-google-search)
@@ -83,7 +79,7 @@ Valid types include `google', `dejanews'
(reference . identity)
(map . nnweb-gmane-create-mapping)
(search . nnweb-gmane-search)
- (address . "http://gmane.org/")
+ (address . "http://search.gmane.org/nov.php")
(identifier . nnweb-gmane-identity)))
"Type-definition alist.")
@@ -123,25 +119,20 @@ Valid types include `google', `dejanews'
(deffoo nnweb-request-scan (&optional group server)
(nnweb-possibly-change-server group server)
(if nnweb-ephemeral-p
- (setq nnweb-hashtb (gnus-make-hashtable 4095)))
+ (setq nnweb-hashtb (gnus-make-hashtable 4095))
+ (unless nnweb-articles
+ (nnweb-read-overview group)))
(funcall (nnweb-definition 'map))
(unless nnweb-ephemeral-p
(nnweb-write-active)
(nnweb-write-overview group)))
(deffoo nnweb-request-group (group &optional server dont-check)
- (nnweb-possibly-change-server nil server)
- (when (and group
- (not (equal group nnweb-group))
- (not nnweb-ephemeral-p))
- (setq nnweb-group group
- nnweb-articles nil)
- (let ((info (assoc group nnweb-group-alist)))
- (when info
- (setq nnweb-type (nth 2 info))
- (setq nnweb-search (nth 3 info))
- (unless dont-check
- (nnweb-read-overview group)))))
+ (nnweb-possibly-change-server group server)
+ (unless (or nnweb-ephemeral-p
+ dont-check
+ nnweb-articles)
+ (nnweb-read-overview group))
(cond
((not nnweb-articles)
(nnheader-report 'nnweb "No matching articles"))
@@ -205,7 +196,7 @@ Valid types include `google', `dejanews'
(nnweb-possibly-change-server nil server)
(save-excursion
(set-buffer nntp-server-buffer)
- (nnmail-generate-active nnweb-group-alist)
+ (nnmail-generate-active (list (assoc server nnweb-group-alist)))
t))
(deffoo nnweb-request-update-info (group info &optional server)
@@ -217,7 +208,7 @@ Valid types include `google', `dejanews'
(deffoo nnweb-request-create-group (group &optional server args)
(nnweb-possibly-change-server nil server)
(nnweb-request-delete-group group)
- (push `(,group ,(cons 1 0) ,@args) nnweb-group-alist)
+ (push `(,group ,(cons 1 0)) nnweb-group-alist)
(nnweb-write-active)
t)
@@ -287,18 +278,16 @@ Valid types include `google', `dejanews'
def))
(defun nnweb-possibly-change-server (&optional group server)
- (nnweb-init server)
(when server
(unless (nnweb-server-opened server)
- (nnweb-open-server server)))
+ (nnweb-open-server server))
+ (nnweb-init server))
(unless nnweb-group-alist
(nnweb-read-active))
(unless nnweb-hashtb
(setq nnweb-hashtb (gnus-make-hashtable 4095)))
(when group
- (when (and (not nnweb-ephemeral-p)
- (equal group nnweb-group))
- (nnweb-request-group group nil t))))
+ (setq nnweb-group group)))
(defun nnweb-init (server)
"Initialize buffers and such."
@@ -317,42 +306,51 @@ Valid types include `google', `dejanews'
(defun nnweb-google-wash-article ()
;; We have Google's masked e-mail addresses here. :-/
- (let ((case-fold-search t))
+ (let ((case-fold-search t)
+ (start-re "<pre>\n *")
+ (end-re "\n *</pre>"))
(goto-char (point-min))
(if (save-excursion
(or (re-search-forward "The requested message.*could not be found."
nil t)
- (not (and (re-search-forward "^<pre>" nil t)
- (re-search-forward "^</pre>" nil t)))))
+ (not (and (re-search-forward start-re nil t)
+ (re-search-forward end-re nil t)))))
;; FIXME: Don't know how to indicate "not found".
;; Should this function throw an error? --rsteib
(progn
(gnus-message 3 "Requested article not found")
(erase-buffer))
(delete-region (point-min)
- (1+ (re-search-forward "^<pre>" nil t)))
+ (re-search-forward start-re))
(goto-char (point-min))
- (delete-region (- (re-search-forward "^</pre>" nil t) (length
"</pre>"))
+ (delete-region (progn
+ (re-search-forward end-re)
+ (match-beginning 0))
(point-max))
(mm-url-decode-entities))))
(defun nnweb-google-parse-1 (&optional Message-ID)
+ "Parse search result in current buffer."
(let ((i 0)
(case-fold-search t)
(active (cadr (assoc nnweb-group nnweb-group-alist)))
Subject Score Date Newsgroups From
map url mid)
(unless active
- (push (list nnweb-group (setq active (cons 1 0))
- nnweb-type nnweb-search)
+ (push (list nnweb-group (setq active (cons 1 0)))
nnweb-group-alist))
;; Go through all the article hits on this page.
(goto-char (point-min))
- (while (re-search-forward
- "a href=/groups\\(\\?[^ \">]*selm=\\([^ &\">]+\\)\\)"
nil t)
- (setq mid (match-string 2)
+ (while
+ (re-search-forward
+ "a
+href=\"/group/\\([^>\"]+\\)/browse_thread/[^>]+#\\([0-9a-f]+\\)"
+ nil t)
+ (setq Newsgroups (match-string-no-properties 1)
+ ;; Note: Starting with Google Groups 2, `mid' is a Google-internal
+ ;; ID, not a proper Message-ID.
+ mid (match-string-no-properties 2)
url (format
- (nnweb-definition 'id) mid))
+ (nnweb-definition 'result) Newsgroups mid))
(narrow-to-region (search-forward ">" nil t)
(search-forward "</a>" nil t))
(mm-url-remove-markup)
@@ -360,25 +358,22 @@ Valid types include `google', `dejanews'
(setq Subject (buffer-string))
(goto-char (point-max))
(widen)
- (forward-line 2)
- (when (looking-at "<br><font[^>]+>")
- (goto-char (match-end 0)))
- (if (not (looking-at "<a[^>]+>"))
- (skip-chars-forward " \t")
- (narrow-to-region (point)
- (search-forward "</a>" nil t))
- (mm-url-remove-markup)
- (mm-url-decode-entities)
- (setq Newsgroups (buffer-string))
- (goto-char (point-max))
- (widen)
- (skip-chars-forward "- \t"))
+ (narrow-to-region (point)
+ (search-forward "</td" nil t))
+
+ (mm-url-remove-markup)
+ (mm-url-decode-entities)
+ (search-backward " - ")
(when (looking-at
- "\\([0-9]+\\)[/ ]\\([A-Za-z]+\\)[/ ]\\([0-9]+\\)[ \t]*by[ \t]*\\([^<]*\\) -
<a")
+ " - \\([a-zA-Z]+\\) \\([0-9]+\\)\\(?: \\([0-9]\\{4\\}\\)\\)?, [^\n]+by
\\([^<\n]+\\)\n")
(setq From (match-string 4)
Date (format "%s %s 00:00:00 %s"
- (match-string 2) (match-string 1)
- (match-string 3))))
+ (match-string 1)
+ (match-string 2)
+ (or (match-string 3)
+ (substring (current-time-string) -4)))))
+
+ (widen)
(forward-line 1)
(incf i)
(unless (nnweb-get-hashtb url)
@@ -409,6 +404,7 @@ Valid types include `google', `dejanews'
(save-excursion
(set-buffer nnweb-buffer)
(erase-buffer)
+ (nnheader-message 7 "Searching google...")
(when (funcall (nnweb-definition 'search) nnweb-search)
(let ((more t)
(i 0))
@@ -419,15 +415,18 @@ Valid types include `google', `dejanews'
(goto-char (point-min))
(incf i 100)
(if (or (not (re-search-forward
- "<td nowrap><a href=\\([^>]+\\).*<span
class=b>Next</span>" nil t))
+ "<a href=\"\n\\([^>\"]+\\)\"><img
src=\"[^\"]+next"
+ nil t))
(>= i nnweb-max-hits))
(setq more nil)
;; Yup, there are more articles
(setq more (concat (nnweb-definition 'base) (match-string 1)))
(when more
(erase-buffer)
+ (nnheader-message 7 "Searching google...(%d)" i)
(mm-url-insert more))))
;; Return the articles in the right order.
+ (nnheader-message 7 "Searching google...done")
(setq nnweb-articles
(sort nnweb-articles 'car-less-than-car))))))
@@ -443,7 +442,8 @@ Valid types include `google', `dejanews'
("hl" . "en")
("lr" . "")
("safe" . "off")
- ("sites" . "groups")))))
+ ("sites" . "groups")
+ ("filter" . "0")))))
t)
(defun nnweb-google-identity (url)
@@ -459,46 +459,61 @@ Valid types include `google', `dejanews'
"Perform the search and create a number-to-url alist."
(save-excursion
(set-buffer nnweb-buffer)
- (erase-buffer)
- (when (funcall (nnweb-definition 'search) nnweb-search)
- (let ((more t)
- (case-fold-search t)
- (active (or (cadr (assoc nnweb-group nnweb-group-alist))
- (cons 1 0)))
- subject group url
- map)
- ;; Remove stuff from the beginning of results
- (goto-char (point-min))
- (search-forward "Search Results</h1><ul>" nil t)
- (delete-region (point-min) (point))
+ (let ((case-fold-search t)
+ (active (or (cadr (assoc nnweb-group nnweb-group-alist))
+ (cons 1 0)))
+ map)
+ (erase-buffer)
+ (nnheader-message 7 "Searching Gmane..." )
+ (when (funcall (nnweb-definition 'search) nnweb-search)
(goto-char (point-min))
- ;; Iterate over the actual hits
- (while (re-search-forward ".*href=\"\\([^\"]+\\)\">\\(.*\\)"
nil t)
- (setq url (concat "http://gmane.org/" (match-string 1)))
- (setq subject (match-string 2))
- (unless (nnweb-get-hashtb url)
- (push
- (list
- (incf (cdr active))
- (make-full-mail-header
- (cdr active) (concat "(" group ") " subject) nil nil
- nil nil 0 0 url))
- map)
- (nnweb-set-hashtb (cadar map) (car map))))
- ;; Return the articles in the right order.
- (setq nnweb-articles
- (sort (nconc nnweb-articles map) 'car-less-than-car))))))
+ ;; Skip the status line
+ (forward-line 1)
+ ;; Thanks to Olly Betts we now have NOV lines in our buffer!
+ (while (not (eobp))
+ (unless (or (eolp) (looking-at "\x0d"))
+ (let ((header (nnheader-parse-nov)))
+ (let ((xref (mail-header-xref header))
+ (from (mail-header-from header))
+ (subject (mail-header-subject header))
+ (rfc2047-encoding-type 'mime))
+ (when (string-match " \\([^:]+\\):\\([0-9]+\\)" xref)
+ (mail-header-set-xref
+ header
+ (format "http://article.gmane.org/%s/%s/raw"
+ (match-string 1 xref)
+ (match-string 2 xref))))
+
+ ;; Add host part to gmane-encrypted addresses
+ (when (string-match "@$" from)
+ (mail-header-set-from header
+ (concat from "public.gmane.org")))
+
+ (mail-header-set-subject header
+ (rfc2047-encode-string subject))
+
+ (unless (nnweb-get-hashtb (mail-header-xref header))
+ (push
+ (list
+ (incf (cdr active))
+ header)
+ map)
+ (nnweb-set-hashtb (cadar map) (car map))))))
+ (forward-line 1)))
+ (nnheader-message 7 "Searching Gmane...done")
+ (setq nnweb-articles
+ (sort (nconc nnweb-articles map) 'car-less-than-car)))))
(defun nnweb-gmane-wash-article ()
(let ((case-fold-search t))
- (goto-char (point-min))
- (re-search-forward "<!--X-Head-of-Message-->" nil t)
- (delete-region (point-min) (point))
(goto-char (point-min))
- (while (looking-at "^<li><em>\\([^
]+\\)</em>.*</li>")
- (replace-match "\\1\\2" t)
- (forward-line 1))
- (mm-url-remove-markup)))
+ (when (search-forward "<!--X-Head-of-Message-->" nil t)
+ (delete-region (point-min) (point))
+ (goto-char (point-min))
+ (while (looking-at "^<li><em>\\([^
]+\\)</em>.*</li>")
+ (replace-match "\\1\\2" t)
+ (forward-line 1))
+ (mm-url-remove-markup))))
(defun nnweb-gmane-search (search)
(mm-url-insert
@@ -506,10 +521,12 @@ Valid types include `google', `dejanews'
(nnweb-definition 'address)
"?"
(mm-url-encode-www-form-urlencoded
- `(("query" . ,search)))))
+ `(("query" . ,search)
+ ("HITSPERPAGE" . ,(number-to-string nnweb-max-hits))))))
(setq buffer-file-name nil)
+ (set-buffer-multibyte t)
+ (mm-decode-coding-region (point-min) (point-max) 'utf-8)
t)
-
(defun nnweb-gmane-identity (url)
"Return a unique identifier based on URL."
1.5 +2 -1 XEmacs/packages/xemacs-packages/gnus/lisp/nnwfm.el
Index: nnwfm.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnwfm.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nnwfm.el 2005/11/15 03:45:59 1.4
+++ nnwfm.el 2006/03/16 04:18:06 1.5
@@ -1,6 +1,7 @@
;;; nnwfm.el --- interfacing with a web forum
-;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news
1.5 +2 -1 XEmacs/packages/xemacs-packages/gnus/lisp/parse-time.el
Index: parse-time.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/parse-time.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- parse-time.el 2005/11/15 03:45:59 1.4
+++ parse-time.el 2006/03/16 04:18:06 1.5
@@ -1,6 +1,7 @@
;;; parse-time.el --- Parsing time strings
-;; Copyright (C) 1996, 2000, 2002 by Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
;; Author: Erik Naggum <erik(a)naggum.no>
;; Keywords: util
1.6 +2 -2 XEmacs/packages/xemacs-packages/gnus/lisp/qp.el
Index: qp.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/qp.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- qp.el 2005/11/15 03:45:59 1.5
+++ qp.el 2006/03/16 04:18:06 1.6
@@ -1,7 +1,7 @@
;;; qp.el --- Quoted-Printable functions
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: mail, extensions
@@ -118,7 +118,7 @@ encode lines starting with \"From\"."
(not (eobp)))
(insert
(prog1
- ;; To unibyte in case of Emacs 22 eight-bit.
+ ;; To unibyte in case of Emacs 23 (unicode) eight-bit.
(format "=%02X" (mm-multibyte-char-to-unibyte (char-after)))
(delete-char 1))))
;; Encode white space at the end of lines.
1.5 +2 -3 XEmacs/packages/xemacs-packages/gnus/lisp/rfc1843.el
Index: rfc1843.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/rfc1843.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rfc1843.el 2005/11/15 03:45:59 1.4
+++ rfc1843.el 2006/03/16 04:18:06 1.5
@@ -1,7 +1,7 @@
;;; rfc1843.el --- HZ (rfc1843) decoding
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh(a)cs.rochester.edu>
;; Keywords: news HZ HZ+ mail i18n
@@ -149,8 +149,7 @@
ftp://ftp.math.psu.edu/pub/simpson/chine
(let* ((inhibit-point-motion-hooks t)
(case-fold-search t)
(ct (message-fetch-field "Content-Type" t))
- (ctl (and ct (ignore-errors
- (mail-header-parse-content-type ct)))))
+ (ctl (and ct (mail-header-parse-content-type ct))))
(if (and ctl (not (string-match "/" (car ctl))))
(setq ctl nil))
(goto-char (point-max))
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/rfc2045.el
Index: rfc2045.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/rfc2045.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rfc2045.el 2005/11/15 03:46:00 1.4
+++ rfc2045.el 2006/03/16 04:18:06 1.5
@@ -1,7 +1,7 @@
;;; rfc2045.el --- Functions for decoding rfc2045 headers
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; This file is part of GNU Emacs.
1.9 +2 -2 XEmacs/packages/xemacs-packages/gnus/lisp/rfc2047.el
Index: rfc2047.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/rfc2047.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- rfc2047.el 2005/12/19 13:35:26 1.8
+++ rfc2047.el 2006/03/16 04:18:07 1.9
@@ -1,7 +1,7 @@
;;; rfc2047.el --- functions for encoding and decoding rfc2047 messages
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; MORIOKA Tomohiko <morioka(a)jaist.ac.jp>
@@ -835,7 +835,7 @@ If your Emacs implementation can't decod
(cond ((eq cs 'ascii)
(setq cs (or (mm-charset-to-coding-system mail-parse-charset)
'raw-text)))
- ((setq cs (mm-coding-system-p cs)))
+ ((mm-coding-system-p cs))
((and charset
(listp mail-parse-ignored-charsets)
(memq 'gnus-unknown mail-parse-ignored-charsets))
1.8 +176 -110 XEmacs/packages/xemacs-packages/gnus/lisp/rfc2231.el
Index: rfc2231.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/rfc2231.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rfc2231.el 2005/12/19 13:35:26 1.7
+++ rfc2231.el 2006/03/16 04:18:07 1.8
@@ -1,7 +1,7 @@
;;; rfc2231.el --- Functions for decoding rfc2231 headers
-;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; This file is part of GNU Emacs.
@@ -41,20 +41,51 @@
N.B. This is in violation with RFC2047, but it seem to be in common use."
(rfc2231-parse-string (rfc2047-decode-string string)))
-(defun rfc2231-parse-string (string)
+(defun rfc2231-parse-string (string &optional signal-error)
"Parse STRING and return a list.
The list will be on the form
- `(name (attribute . value) (attribute . value)...)"
+ `(name (attribute . value) (attribute . value)...)'.
+
+If the optional SIGNAL-ERROR is non-nil, signal an error when this
+function fails in parsing of parameters. Otherwise, this function
+must never cause a Lisp error."
(with-temp-buffer
(let ((ttoken (ietf-drums-token-to-list ietf-drums-text-token))
(stoken (ietf-drums-token-to-list ietf-drums-tspecials))
(ntoken (ietf-drums-token-to-list "0-9"))
- (prev-value "")
- display-name mailbox c display-string parameters
- attribute value type subtype number encoded
- prev-attribute prev-encoded)
- (ietf-drums-init (mail-header-remove-whitespace
- (mail-header-remove-comments string)))
+ c type attribute encoded number prev-attribute vals
+ prev-encoded parameters value)
+ (ietf-drums-init
+ (condition-case nil
+ (mail-header-remove-whitespace
+ (mail-header-remove-comments string))
+ ;; The most likely cause of an error is unbalanced parentheses
+ ;; or double-quotes. If all parentheses and double-quotes are
+ ;; quoted meaninglessly with backslashes, removing them might
+ ;; make it parseable. Let's try...
+ (error
+ (let (mod)
+ (when (and (string-match "\\\\\"" string)
+ (not (string-match "\\`\"\\|[^\\]\"" string)))
+ (setq string (mm-replace-in-string string "\\\\\""
"\"")
+ mod t))
+ (when (and (string-match "\\\\(" string)
+ (string-match "\\\\)" string)
+ (not (string-match "\\`(\\|[^\\][()]" string)))
+ (setq string (mm-replace-in-string string "\\\\\\([()]\\)"
"\\1")
+ mod t))
+ (or (and mod
+ (ignore-errors
+ (mail-header-remove-whitespace
+ (mail-header-remove-comments string))))
+ ;; Finally, attempt to extract only type.
+ (if (string-match
+ (concat "\\`[\t\n ]*\\([^" ietf-drums-tspecials "\t\n ]+"
+ "\\(/[^" ietf-drums-tspecials
+ "\t\n ]+\\)?\\)\\([\t\n ;]\\|\\'\\)")
+ string)
+ (match-string 1 string)
+ ""))))))
(let ((table (copy-syntax-table ietf-drums-syntax-table)))
(modify-syntax-entry ?\' "w" table)
(modify-syntax-entry ?* " " table)
@@ -66,67 +97,83 @@ The list will be on the form
(set-syntax-table table))
(setq c (char-after))
(when (and (memq c ttoken)
- (not (memq c stoken)))
- (setq type (downcase (buffer-substring
- (point) (progn (forward-sexp 1) (point)))))
+ (not (memq c stoken))
+ (setq type (ignore-errors
+ (downcase
+ (buffer-substring (point) (progn
+ (forward-sexp 1)
+ (point)))))))
;; Do the params
- (while (not (eobp))
- (setq c (char-after))
- (unless (eq c ?\;)
- (error "Invalid header: %s" string))
- (forward-char 1)
- ;; If c in nil, then this is an invalid header, but
- ;; since elm generates invalid headers on this form,
- ;; we allow it.
- (when (setq c (char-after))
- (if (and (memq c ttoken)
- (not (memq c stoken)))
- (setq attribute
- (intern
- (downcase
- (buffer-substring
- (point) (progn (forward-sexp 1) (point))))))
- (error "Invalid header: %s" string))
- (setq c (char-after))
- (when (eq c ?*)
- (forward-char 1)
- (setq c (char-after))
- (if (not (memq c ntoken))
- (setq encoded t
- number nil)
- (setq number
- (string-to-number
- (buffer-substring
- (point) (progn (forward-sexp 1) (point)))))
+ (condition-case err
+ (progn
+ (while (not (eobp))
(setq c (char-after))
- (when (eq c ?*)
- (setq encoded t)
+ (unless (eq c ?\;)
+ (error "Invalid header: %s" string))
+ (forward-char 1)
+ ;; If c in nil, then this is an invalid header, but
+ ;; since elm generates invalid headers on this form,
+ ;; we allow it.
+ (when (setq c (char-after))
+ (if (and (memq c ttoken)
+ (not (memq c stoken)))
+ (setq attribute
+ (intern
+ (downcase
+ (buffer-substring
+ (point) (progn (forward-sexp 1) (point))))))
+ (error "Invalid header: %s" string))
+ (setq c (char-after))
+ (if (eq c ?*)
+ (progn
+ (forward-char 1)
+ (setq c (char-after))
+ (if (not (memq c ntoken))
+ (setq encoded t
+ number nil)
+ (setq number
+ (string-to-number
+ (buffer-substring
+ (point) (progn (forward-sexp 1) (point)))))
+ (setq c (char-after))
+ (when (eq c ?*)
+ (setq encoded t)
+ (forward-char 1)
+ (setq c (char-after)))))
+ (setq number nil
+ encoded nil))
+ ;; See if we have any previous continuations.
+ (when (and prev-attribute
+ (not (eq prev-attribute attribute)))
+ (setq vals
+ (mapconcat 'cdr (sort vals 'car-less-than-car) ""))
+ (push (cons prev-attribute
+ (if prev-encoded
+ (rfc2231-decode-encoded-string vals)
+ vals))
+ parameters)
+ (setq prev-attribute nil
+ vals nil
+ prev-encoded nil))
+ (unless (eq c ?=)
+ (error "Invalid header: %s" string))
(forward-char 1)
- (setq c (char-after)))))
- ;; See if we have any previous continuations.
- (when (and prev-attribute
- (not (eq prev-attribute attribute)))
- (push (cons prev-attribute
- (if prev-encoded
- (rfc2231-decode-encoded-string prev-value)
- prev-value))
- parameters)
- (setq prev-attribute nil
- prev-value ""
- prev-encoded nil))
- (unless (eq c ?=)
- (error "Invalid header: %s" string))
- (forward-char 1)
- (setq c (char-after))
- (cond
- ((eq c ?\")
- (setq value
- (buffer-substring (1+ (point))
- (progn (forward-sexp 1) (1- (point))))))
- ((and (or (memq c ttoken)
- (> c ?\177)) ;; EXTENSION: Support non-ascii chars.
- (not (memq c stoken)))
- (setq value (buffer-substring
+ (setq c (char-after))
+ (cond
+ ((eq c ?\")
+ (setq value (buffer-substring (1+ (point))
+ (progn
+ (forward-sexp 1)
+ (1- (point)))))
+ (when encoded
+ (setq value (mapconcat (lambda (c) (format "%%%02x" c))
+ value ""))))
+ ((and (or (memq c ttoken)
+ ;; EXTENSION: Support non-ascii chars.
+ (> c ?\177))
+ (not (memq c stoken)))
+ (setq value
+ (buffer-substring
(point)
(progn
(forward-sexp)
@@ -138,59 +185,72 @@ The list will be on the form
(forward-char 1)
(forward-sexp))
(point)))))
- (t
- (error "Invalid header: %s" string)))
- (if number
- (setq prev-attribute attribute
- prev-value (concat prev-value value)
- prev-encoded encoded)
- (push (cons attribute
- (if encoded
- (rfc2231-decode-encoded-string value)
- value))
- parameters))))
-
- ;; Take care of any final continuations.
- (when prev-attribute
- (push (cons prev-attribute
- (if prev-encoded
- (rfc2231-decode-encoded-string prev-value)
- prev-value))
- parameters))
+ (t
+ (error "Invalid header: %s" string)))
+ (if number
+ (progn
+ (push (cons number value) vals)
+ (setq prev-attribute attribute
+ prev-encoded encoded))
+ (push (cons attribute
+ (if encoded
+ (rfc2231-decode-encoded-string value)
+ value))
+ parameters))))
+
+ ;; Take care of any final continuations.
+ (when prev-attribute
+ (setq vals (mapconcat 'cdr (sort vals 'car-less-than-car) ""))
+ (push (cons prev-attribute
+ (if prev-encoded
+ (rfc2231-decode-encoded-string vals)
+ vals))
+ parameters)))
+ (error
+ (setq parameters nil)
+ (if signal-error
+ (signal (car err) (cdr err))
+ ;;(message "%s" (error-message-string err))
+ )))
- (when type
- `(,type ,@(nreverse parameters)))))))
+ (cons type (nreverse parameters))))))
(defun rfc2231-decode-encoded-string (string)
"Decode an RFC2231-encoded string.
-These look like
\"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"."
- (with-temp-buffer
- (let ((elems (split-string string "'")))
- ;; The encoded string may contain zero to two single-quote
- ;; marks. This should give us the encoded word stripped
- ;; of any preceding values.
- (insert (car (last elems)))
+These look like:
+ \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\",
+ \"us-ascii''This%20is%20%2A%2A%2Afun%2A%2A%2A\",
+ \"'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\",
+ \"''This%20is%20%2A%2A%2Afun%2A%2A%2A\", or
+ \"This is ***fun***\"."
+ (string-match "\\`\\(\\([^']+\\)?'\\([^']+\\)?'\\)?\\(.+\\)"
string)
+ (let ((coding-system (mm-charset-to-coding-system (match-string 2 string)))
+ ;;(language (match-string 3 string))
+ (value (match-string 4 string)))
+ (mm-with-multibyte-buffer
+ (insert value)
(goto-char (point-min))
(while (search-forward "%" nil t)
(insert
(prog1
(string-to-number (buffer-substring (point) (+ (point) 2)) 16)
(delete-region (1- (point)) (+ (point) 2)))))
- ;; Encode using the charset, if any.
- (when (and (mm-multibyte-p)
- (> (length elems) 1)
- (not (equal (intern (downcase (car elems))) 'us-ascii)))
- (mm-decode-coding-region (point-min) (point-max)
- (intern (downcase (car elems)))))
+ ;; Decode using the charset, if any.
+ (unless (memq coding-system '(nil ascii))
+ (mm-decode-coding-region (point-min) (point-max) coding-system))
(buffer-string))))
(defun rfc2231-encode-string (param value)
- "Return and PARAM=VALUE string encoded according to RFC2231."
+ "Return and PARAM=VALUE string encoded according to RFC2231.
+Use `mml-insert-parameter' or `mml-insert-parameter-string' to insert
+the result of this function."
(let ((control (ietf-drums-token-to-list ietf-drums-no-ws-ctl-token))
(tspecial (ietf-drums-token-to-list ietf-drums-tspecials))
(special (ietf-drums-token-to-list "*'%\n\t"))
(ascii (ietf-drums-token-to-list ietf-drums-text-token))
(num -1)
+ ;; Don't make lines exceeding 76 column.
+ (limit (- 74 (length param)))
spacep encodep charsetp charset broken)
(with-temp-buffer
(insert value)
@@ -209,28 +269,34 @@ These look like \"us-ascii'en-us'This%20
(when charsetp
(setq charset (mm-encode-body)))
(cond
- ((or encodep charsetp)
+ ((or encodep charsetp
+ (progn
+ (end-of-line)
+ (> (current-column) (if spacep (- limit 2) limit))))
+ (setq limit (- limit 6))
(goto-char (point-min))
+ (insert (symbol-name (or charset 'us-ascii)) "''")
(while (not (eobp))
- (when (> (current-column) 60)
- (insert ";\n")
- (setq broken t))
(if (or (not (memq (following-char) ascii))
(memq (following-char) control)
(memq (following-char) tspecial)
(memq (following-char) special)
(eq (following-char) ? ))
(progn
+ (when (>= (current-column) (1- limit))
+ (insert ";\n")
+ (setq broken t))
(insert "%" (format "%02x" (following-char)))
(delete-char 1))
+ (when (> (current-column) limit)
+ (insert ";\n")
+ (setq broken t))
(forward-char 1)))
(goto-char (point-min))
- (insert (symbol-name (or charset 'us-ascii)) "''")
- (goto-char (point-min))
(if (not broken)
(insert param "*=")
(while (not (eobp))
- (insert (if (>= num 0) " " "\n ")
+ (insert (if (>= num 0) " " "")
param "*" (format "%d" (incf num)) "*=")
(forward-line 1))))
(spacep
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/score-mode.el
Index: score-mode.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/score-mode.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- score-mode.el 2005/11/15 03:46:00 1.4
+++ score-mode.el 2006/03/16 04:18:07 1.5
@@ -1,7 +1,7 @@
;;; score-mode.el --- mode for editing Gnus score files
;; Copyright (C) 1996, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: news, mail
1.5 +29 -13 XEmacs/packages/xemacs-packages/gnus/lisp/smiley.el.upstream
Index: smiley.el.upstream
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/smiley.el.upstream,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- smiley.el.upstream 2005/11/15 03:46:00 1.4
+++ smiley.el.upstream 2006/03/16 04:18:07 1.5
@@ -1,7 +1,7 @@
;;; smiley.el --- displaying smiley faces
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Dave Love <fx(a)gnu.org>
;; Keywords: news mail multimedia
@@ -31,8 +31,21 @@
;; I'm not sure we need that degree of rococoness and defaults like a
;; yellow background. Also, using PBM means we can display the images
;; more generally. -- fx
+;; `smiley.el' was replaced by `smiley-ems.el' on 2002-01-26 (after fx'
+;; comment).
-;;; Test smileys: :-) :-\ :-( :-/
+;; Test smileys:
+;; smile ^:-) ^:)
+;; blink ;-) ;)
+;; forced :-]
+;; braindamaged 8-)
+;; indifferent :-|
+;; wry :-/ :-\
+;; sad :-(
+;; evil >:-)
+;; cry ;-(
+;; dead X-)
+;; grin :-D
;;; Code:
@@ -45,8 +58,9 @@
:group 'gnus-visual)
;; Maybe this should go.
-(defcustom smiley-data-directory (nnheader-find-etc-directory
"images/smilies")
- "*Location of the smiley faces files."
+(defcustom smiley-data-directory
+ (nnheader-find-etc-directory "images/smilies")
+ "Location of the smiley faces files."
:type 'directory
:group 'smiley)
@@ -61,8 +75,8 @@
("\\(:-(\\)\\W" 1 "sad")
("\\(:-{\\)\\W" 1 "frown"))
"*A list of regexps to map smilies to images.
-The elements are (REGEXP MATCH FILE), where MATCH is the submatch in
-regexp to replace with IMAGE. IMAGE is the name of a PBM file in
+The elements are (REGEXP MATCH IMAGE), where MATCH is the submatch in
+regexp to replace with IMAGE. IMAGE is the name of an image file in
`smiley-data-directory'."
:type '(repeat (list regexp
(integer :tag "Regexp match number")
@@ -78,7 +92,7 @@ regexp to replace with IMAGE. IMAGE is
(when (gnus-image-type-available-p 'xpm)
(push "xpm" types))
types)
- "*List of suffixes on picon file names to try."
+ "*List of suffixes on smiley file names to try."
:version "22.1"
:type '(repeat string)
:group 'smiley)
@@ -86,6 +100,7 @@ regexp to replace with IMAGE. IMAGE is
(defvar smiley-cached-regexp-alist nil)
(defun smiley-update-cache ()
+ (setq smiley-cached-regexp-alist nil)
(dolist (elt (if (symbolp smiley-regexp-alist)
(symbol-value smiley-regexp-alist)
smiley-regexp-alist))
@@ -104,12 +119,13 @@ regexp to replace with IMAGE. IMAGE is
(push (list (car elt) (cadr elt) image)
smiley-cached-regexp-alist)))))))
-(defvar smiley-mouse-map
- (let ((map (make-sparse-keymap)))
- (define-key map [down-mouse-2] 'ignore) ; override widget
- (define-key map [mouse-2]
- 'smiley-mouse-toggle-buffer)
- map))
+;; Not implemented:
+;; (defvar smiley-mouse-map
+;; (let ((map (make-sparse-keymap)))
+;; (define-key map [down-mouse-2] 'ignore) ; override widget
+;; (define-key map [mouse-2]
+;; 'smiley-mouse-toggle-buffer)
+;; map))
;;;###autoload
(defun smiley-region (start end)
1.8 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/smime.el
Index: smime.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/smime.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- smime.el 2005/11/15 03:46:00 1.7
+++ smime.el 2006/03/16 04:18:07 1.8
@@ -1,7 +1,7 @@
;;; smime.el --- S/MIME support library
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon(a)josefsson.org>
;; Keywords: SMIME X.509 PEM OpenSSL
1.7 +6 -2 XEmacs/packages/xemacs-packages/gnus/lisp/spam-report.el
Index: spam-report.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/spam-report.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- spam-report.el 2005/11/15 03:46:00 1.6
+++ spam-report.el 2006/03/16 04:18:08 1.7
@@ -1,6 +1,6 @@
;;; spam-report.el --- Reporting spam
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Teodor Zlatanov <tzz(a)lifelogs.com>
;; Keywords: network
@@ -50,7 +50,11 @@ instead."
:group 'spam-report)
(defcustom spam-report-gmane-use-article-number t
- "Whether the article number (faster!) or the header should be used."
+ "Whether the article number (faster!) or the header should be used.
+
+You must set this to nil if you don't read Gmane groups directly
+from
news.gmane.org, e.g. when using local newsserver such as
+leafnode."
:type 'boolean
:group 'spam-report)
1.6 +2 -2 XEmacs/packages/xemacs-packages/gnus/lisp/spam-stat.el
Index: spam-stat.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/spam-stat.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- spam-stat.el 2005/11/15 03:46:00 1.5
+++ spam-stat.el 2006/03/16 04:18:08 1.6
@@ -1,6 +1,6 @@
;;; spam-stat.el --- detecting spam based on statistics
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Alex Schroeder <alex(a)gnu.org>
;; Keywords: network
@@ -323,7 +323,7 @@ Use `spam-stat-ngood', `spam-stat-nbad',
,@body))
(defun spam-stat-buffer-words ()
- "Return a hash table of words and number of occurences in the buffer."
+ "Return a hash table of words and number of occurrences in the buffer."
(with-spam-stat-max-buffer-size
(with-syntax-table spam-stat-syntax-table
(goto-char (point-min))
1.7 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/spam.el
Index: spam.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/spam.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- spam.el 2005/11/15 03:46:01 1.6
+++ spam.el 2006/03/16 04:18:08 1.7
@@ -1,6 +1,6 @@
;;; spam.el --- Identifying spam
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Keywords: network
1.5 +3 -2 XEmacs/packages/xemacs-packages/gnus/lisp/time-date.el
Index: time-date.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/time-date.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- time-date.el 2005/11/15 03:46:01 1.4
+++ time-date.el 2006/03/16 04:18:08 1.5
@@ -1,6 +1,7 @@
;;; time-date.el --- Date and time handling functions
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005
-;; Free Software Foundation, Inc.
+
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi(a)gnus.org>
;; Masanobu Umeda <umerin(a)mse.kyutech.ac.jp>
1.6 +2 -2 XEmacs/packages/xemacs-packages/gnus/lisp/utf7.el
Index: utf7.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/utf7.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- utf7.el 2005/11/15 03:46:01 1.5
+++ utf7.el 2006/03/16 04:18:08 1.6
@@ -1,7 +1,7 @@
;;; utf7.el --- UTF-7 encoding/decoding for Emacs -*-coding: iso-8859-1;-*-
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Jon K Hellan <hellan(a)acm.org>
;; Maintainer: bugs(a)gnus.org
@@ -80,7 +80,7 @@
(defconst utf7-utf-16-coding-system
(cond ((mm-coding-system-p 'utf-16-be-no-signature) ; Mule-UCS
'utf-16-be-no-signature)
- ((and (mm-coding-system-p 'utf-16-be) ; Emacs 22.1
+ ((and (mm-coding-system-p 'utf-16-be) ; Emacs 21.3, Emacs 22
;; Avoid versions with BOM.
(= 2 (length (encode-coding-string "a" 'utf-16-be))))
'utf-16-be)
1.5 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/uudecode.el
Index: uudecode.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/uudecode.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- uudecode.el 2005/11/15 03:46:01 1.4
+++ uudecode.el 2006/03/16 04:18:08 1.5
@@ -1,7 +1,7 @@
;;; uudecode.el -- elisp native uudecode
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh(a)cs.rochester.edu>
;; Keywords: uudecode news
1.5 +2 -2 XEmacs/packages/xemacs-packages/gnus/lisp/webmail.el
Index: webmail.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/webmail.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- webmail.el 2005/11/15 03:46:01 1.4
+++ webmail.el 2006/03/16 04:18:08 1.5
@@ -1,7 +1,7 @@
;;; webmail.el --- interface of web mail
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh(a)cs.rochester.edu>
;; Keywords: hotmail netaddress my-deja netscape
@@ -637,7 +637,7 @@
(goto-char (point-min))
(delete-blank-lines)
(setq ct (mail-fetch-field "content-type")
- ctl (ignore-errors (mail-header-parse-content-type ct))
+ ctl (and ct (mail-header-parse-content-type ct))
;;cte (mail-fetch-field "content-transfer-encoding")
cd (mail-fetch-field "content-disposition")
description (mail-fetch-field "content-description")
1.4 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/yenc.el
Index: yenc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/yenc.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- yenc.el 2005/11/15 03:46:02 1.3
+++ yenc.el 2006/03/16 04:18:09 1.4
@@ -1,6 +1,6 @@
;;; yenc.el --- elisp native yenc decoder
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Jesper Harder <harder(a)ifa.au.dk>
;; Keywords: yenc news
1.10 +104 -28 XEmacs/packages/xemacs-packages/gnus/texi/ChangeLog.upstream
Index: ChangeLog.upstream
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/texi/ChangeLog.upstream,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ChangeLog.upstream 2006/01/04 07:05:34 1.9
+++ ChangeLog.upstream 2006/03/16 04:19:47 1.10
@@ -1,3 +1,79 @@
+2006-03-10 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * gnus.texi (NoCeM): Mention gnus-use-nocem can also be a number.
+
+2006-03-10 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * gnus.texi (Fancy Mail Splitting): Improve sentences so as to be
+ easy to understand.
+
+2006-03-09 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * gnus.texi: Markup fix.
+ (Fancy Mail Splitting): Specify new feature.
+
+2006-03-08 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * gnus.texi (Fancy Mail Splitting): Improve descriptions about
+ partial-words matching.
+
+2006-03-07 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * emacs-mime.texi (Display Customization): Reword image/.* stuff.
+
+ * gnus.texi (Oort Gnus): Add note about `gnus-load'.
+ (MIME Commands): Fix mm-discouraged-alternatives.
+
+2006-03-03 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * xemacs.mak: Remove outdated file. Use make.bat instead.
+
+ * gnus.texi (Oort Gnus): Add `mm-fill-flowed'.
+
+2006-02-27 Simon Josefsson <jas(a)extundo.com>
+
+ * emacs-mime.texi (Flowed text): Add mm-fill-flowed. (Sync
+ 2004-01-27 from the trunk).
+
+2006-02-09 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * gnus.texi (Gnus Versions): Add history beyond start of Oort.
+
+2006-01-31 Romain Francoise <romain(a)orebokech.com>
+
+ * message.texi (Message Headers): Explain what
+ `message-alternative-emails' does in more detail.
+ Update copyright year.
+
+2006-01-26 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * ps/Makefile.in (distclean): Remove Makefile.
+
+ * Makefile.in (almost-clean): Rename from clean.
+ (clean): Rename from veryclean.
+ (distclean): Use clean.
+ (pspackage): Use almost-clean.
+
+2006-01-16 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * gnus.texi: Update copyright.
+
+2006-01-13 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * gnus.texi (Article Washing): Additions.
+
+2006-01-08 Alex Schroeder <alex(a)gnu.org>
+
+ * pgg.texi (Caching passphrase): Rewording.
+
+2006-01-10 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * gnus.texi (RSS): Document nnrss-wash-html-in-text-plain-parts.
+
+2006-01-06 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * gnus.texi (RSS): Addition.
+
2005-12-22 Katsumi Yamaoka <yamaoka(a)jpl.org>
* gnus.texi (Summary Post Commands): Fix function bound to `S O p'.
@@ -83,7 +159,7 @@
2005-11-01 Katsumi Yamaoka <yamaoka(a)jpl.org>
- * gnus.texi (Group Parameters): Mention new varable
+ * gnus.texi (Group Parameters): Mention new variable
gnus-parameters-case-fold-search.
(Home Score File): Addition.
@@ -272,7 +348,7 @@
* gnus.texi (RSS): Fix the keystroke.
-2005-01-16 Xavier Maillard <zedek(a)gnu-rox.org> (tiny change)
+2005-01-16 Xavier Maillard <zedek(a)gnu-rox.org> (tiny change)
* gnus-faq.texi ([4.1]): Typo.
@@ -546,7 +622,7 @@
* gnus.texi (Group Parameters): Clarify.
-2003-12-11 Kevin Greiner <kgreiner(a)xpediantsolutions.com>
+2003-12-11 Kevin Greiner <kgreiner(a)xpediantsolutions.com>
* gnus.texi (Agent Parameters): Added references in Topic and
Group Parameters. Added gnus-agent-cat-disable-undownloaded-faces
@@ -793,11 +869,13 @@
* gnus.texi (Filtering Spam Using The Spam ELisp Package):
mentioned the spam-install-hooks mess
+2003-07-11 Matthias Andree <ma(a)dt.e-technik.uni-dortmund.de> (tiny change)
+
+ * gnus.texi (Splitting in IMAP): Typos.
+
2003-07-11 Simon Josefsson <jas(a)extundo.com>
- * gnus.texi (Splitting in IMAP): Typos, tiny patch from Matthias
- Andree <ma(a)dt.e-technik.uni-dortmund.de>.
- (Splitting in IMAP): Mention Sieve.
+ * gnus.texi (Splitting in IMAP): Mention Sieve.
2003-07-10 Simon Josefsson <jas(a)extundo.com>
@@ -923,12 +1001,11 @@
* message.texi (Insertion Variables): do.
-2003-05-13 Simon Josefsson <jas(a)extundo.com>
+2003-05-13 Niklas Morberg <niklas.morberg(a)axis.com> (tiny change)
- * gnus.texi (IMAP, Agent and IMAP, Oort Gnus): s/a/an/. Tiny
- patch from Niklas Morberg <niklas.morberg(a)axis.com>.
+ * gnus.texi (IMAP, Agent and IMAP, Oort Gnus): s/a/an/.
-2003-05-12 Kevin Greiner <kgreiner(a)xpediantsolutions.com>
+2003-05-12 Kevin Greiner <kgreiner(a)xpediantsolutions.com>
* gnus.texi (Agent Visuals): Add.
@@ -1183,7 +1260,7 @@
* message.texi (IDNA): New.
-2003-03-18 Kevin Greiner <kgreiner(a)xpediantsolutions.com>
+2003-03-18 Kevin Greiner <kgreiner(a)xpediantsolutions.com>
* gnus.texi (Gnus Unplugged): Refer to new agent Group/Topic
parameters.
@@ -1221,10 +1298,9 @@
* gnus.texi (Required Back End Functions): Add.
-2003-03-17 Simon Josefsson <jas(a)extundo.com>
+2003-03-17 Frank Haun <pille3003(a)fhaun.de> (tiny change)
- * pgg.texi: Fix setfilename. Tiny patch by Frank Haun
- <pille3003(a)fhaun.de>.
+ * pgg.texi: Fix setfilename.
2003-03-09 Paul Jarc <prj(a)po.cwru.edu>
@@ -1260,7 +1336,7 @@
(Document Server Internals, Score Variables, Adaptive Scoring)
(X-Face, Hashcash): do.
-2003-02-28 Vasily Korytov <deskpot(a)myrealbox.com>
+2003-02-28 Vasily Korytov <deskpot(a)myrealbox.com>
* gnus.texi: New values, 'to-list and 'cc-list, for
gnus-boring-article-headers.
@@ -2142,7 +2218,7 @@
* gnus.texi (Mail Spool): Add cindex for marks.
(Mail Folders): Add cindex for marks.
-2002-03-24 Raymond Scholz <rscholz(a)zonix.de>
+2002-03-24 Raymond Scholz <rscholz(a)zonix.de>
* gnus.texi (Summary Buffer Lines): Fix doc.
@@ -2150,7 +2226,7 @@
* Makefile.in (booklet.dvi, booklet.pdf): Support booklet.
-2002-03-24 Felix Natter <fnatter(a)gmx.net>
+2002-03-24 Felix Natter <fnatter(a)gmx.net>
* booklet.tex, bk-at.tex, bk-lt.tex, gnuslog-booklet.eps: New file.
* gnusref.tex, refcard.tex: Support booklet.
@@ -2180,7 +2256,7 @@
* message.texi (Security): Add mml-unsecure-message.
(Mailing Lists): Index message-goto-mail-followup-to.
-2002-03-23 Jesper Harder <harder(a)ifa.au.dk>
+2002-03-23 Jesper Harder <harder(a)ifa.au.dk>
* gnusref.tex, refcard.tex: Addition.
@@ -2259,7 +2335,7 @@
* gnus.texi (Mail Source Specifiers): Use @uref.
-2002-02-13 Jesper Harder <harder(a)ifa.au.dk>
+2002-02-13 Jesper Harder <harder(a)ifa.au.dk>
* message.texi, gnus.texi, emacs-mime.texi: Use small caps
consistently. MIME, NOV, NNTP, HTML, IMAP are written with @sc
@@ -3329,11 +3405,11 @@
* gnus.texi (Sorting Groups): Note `C-k' and `C-y' for manually
moving groups around.
-2001-04-07 Ryan Yeske <rcyeske(a)vcn.bc.ca>
+2001-04-07 Ryan Yeske <rcyeske(a)vcn.bc.ca>
* gnus.texi (Splitting in IMAP): Fix.
-2001-04-07 Jesper Harder <harder(a)ifa.au.dk>
+2001-04-07 Jesper Harder <harder(a)ifa.au.dk>
* gnus.texi (More Threading): Fix.
@@ -3456,7 +3532,7 @@
* gnus.texi (Top): Add Using GPG.
-2001-02-02 David Masterson <dmasters(a)Rational.Com>
+2001-02-02 David Masterson <dmasters(a)Rational.Com>
* gnus.texi (The Server is Down): Add link to Group Levels.
@@ -3475,7 +3551,7 @@
* message.texi (message-ignored-news-headers): Add "X-Draft-From:".
(message-ignored-mail-headers): Ditto.
-2001-01-21 Raymond Scholz <ray-2001(a)zonix.de>
+2001-01-21 Raymond Scholz <ray-2001(a)zonix.de>
* message.texi: Rename X-Mailer and X-Newsreader to User-Agent.
@@ -3491,7 +3567,7 @@
* emacs-mime.texi: Set dircategory to Emacs.
-2001-01-16 Jesper Harder <harder(a)ifa.au.dk>
+2001-01-16 Jesper Harder <harder(a)ifa.au.dk>
* gnus.texi (Group Line Specification): Add.
@@ -3660,7 +3736,7 @@
group names as target, where `gnus-split-methods' uses file
names. Suggested by Nevin Kapur.
-2000-11-07 Martin Buchholz <martin(a)xemacs.org>
+2000-11-07 Martin Buchholz <martin(a)xemacs.org>
* gnus.texi: Doc fix.
@@ -3673,7 +3749,7 @@
* gnus.texi (Finding the News): @env is not supported in texinfo 3.12.
-2000-10-31 Jorge Godoy <godoy(a)conectiva.com>
+2000-10-31 Jorge Godoy <godoy(a)conectiva.com>
* gnus.texi: gnus-gpg document.
@@ -3812,7 +3888,7 @@
Explain interaction between these. Add Lisp example for setting
`nnmail-expiry-target'.
-2000-08-04 Andreas Oeldenberger <andreas.oeldenberger(a)gmx.net>
+2000-08-04 Andreas Oeldenberger <andreas.oeldenberger(a)gmx.net>
* message.texi (Forwarding): Fix.
@@ -3969,7 +4045,7 @@
* gnus.texi (MIME Commands): Fix.
-2000-01-03 Karl Kleinpaste <karl(a)justresearch.com>
+2000-01-03 Karl Kleinpaste <karl(a)justresearch.com>
* gnus.texi (Splitting in IMAP): Add '.' after @xref.
1.9 +13 -8 XEmacs/packages/xemacs-packages/gnus/texi/emacs-mime.texi
Index: emacs-mime.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/texi/emacs-mime.texi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- emacs-mime.texi 2006/01/04 07:05:35 1.8
+++ emacs-mime.texi 2006/03/16 04:19:47 1.9
@@ -9,7 +9,7 @@
@copying
This file documents the Emacs MIME interface functionality.
-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
@quotation
@@ -322,13 +322,14 @@ you could say something like:
(remove "text/html" mm-automatic-display))
@end lisp
-Adding @code{"image/.*"} might also be useful. Spammers use it as the
-prefered part of @samp{multipart/alternative} messages, and you might
+Adding @code{"image/.*"} might also be useful. Spammers use images as
+the prefered part of @samp{multipart/alternative} messages, so you might
not notice there are other parts. See also
-@code{gnus-buttonized-mime-types} (@pxref{MIME Commands, ,MIME Commands,
-gnus, Gnus Manual}), to which adding @code{"multipart/alternative"}
-enables you to choose manually one of two types those mails include.
-For example, you can set those variables like:
+@code{gnus-buttonized-mime-types}, @ref{MIME Commands, ,MIME Commands,
+gnus, Gnus Manual}. After adding @code{"multipart/alternative"} to
+@code{gnus-buttonized-mime-types} you can choose manually which
+alternative you'd like to view. For example, you can set those
+variables like:
@lisp
(setq gnus-buttonized-mime-types
@@ -983,7 +984,11 @@ together and wrapped after the column de
@code{fill-flowed-display-column}. The default is to wrap after
@code{fill-column}.
-
+@table @code
+@item mm-fill-flowed
+@vindex mm-fill-flowed
+If non-@code{nil} a format=flowed article will be displayed flowed.
+@end table
@node Interface Functions
1.12 +139 -47 XEmacs/packages/xemacs-packages/gnus/texi/gnus.texi
Index: gnus.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/texi/gnus.texi,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gnus.texi 2006/01/04 07:05:35 1.11
+++ gnus.texi 2006/03/16 04:19:47 1.12
@@ -8,7 +8,7 @@
@copying
Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -8571,7 +8571,9 @@ Treat @acronym{HTML} (@code{gnus-article
usually done automatically by Gnus if the message in question has a
@code{Content-Type} header that says that the message is @acronym{HTML}.
-If a prefix is given, a charset will be asked for.
+If a prefix is given, a charset will be asked for. If it is a number,
+the charset defined in @code{gnus-summary-show-article-charset-alist}
+(@pxref{Paging the Article}) will be used.
@vindex gnus-article-wash-function
The default is to use the function specified by
@@ -8582,12 +8584,15 @@ Customization, emacs-mime, The Emacs MIM
can use include:
@table @code
-@item W3
+@item w3
Use Emacs/W3.
@item w3m
Use @uref{http://emacs-w3m.namazu.org/, emacs-w3m}.
+@item w3m-standalone
+Use @uref{http://w3m.sourceforge.net/, w3m}.
+
@item links
Use @uref{http://links.sf.net/, Links}.
@@ -9364,10 +9369,10 @@ Display "multipart/alternative" parts as
Display "multipart/related" parts as "multipart/mixed".
If displaying "text/html" is discouraged, see
-@code{mm-discouraged-alternatives} in @ref{Display Customization,
-Display Customization, , emacs-mime, Emacs-Mime Manual}. Images or
-other material inside a "multipart/related" part might be overlooked
-when this variable is @code{nil}.
+@code{mm-discouraged-alternatives}, images or other material inside a
+"multipart/related" part might be overlooked when this variable is
+@code{nil}. @ref{Display Customization, Display Customization, ,
+emacs-mime, Emacs-Mime Manual}.
@vindex gnus-mime-display-multipart-as-mixed
@item gnus-mime-display-multipart-as-mixed
@@ -14001,13 +14006,22 @@ splits. Here are the possible split syn
If the split is a string, that will be taken as a group name. Normal
regexp match expansion will be done. See below for examples.
-@item (@var{field} @var{value} [- @var{restrict} [@dots{}] ] @var{split})
-If the split is a list, the first element of which is a string, then
-store the message as specified by @var{split}, if header @var{field}
-(a regexp) contains @var{value} (also a regexp). If @var{restrict}
-(yet another regexp) matches some string after @var{field} and before
-the end of the matched @var{value}, the @var{split} is ignored. If
-none of the @var{restrict} clauses match, @var{split} is processed.
+@c Don't fold this line.
+@item (@var{field} @var{value} [- @var{restrict} [@dots{}] ] @var{split}
[@var{invert-partial}])
+The split can be a list containing at least three elements. If the
+first element @var{field} (a regexp matching a header) contains
+@var{value} (also a regexp) then store the message as specified by
+@var{split}.
+
+If @var{restrict} (yet another regexp) matches some string after
+@var{field} and before the end of the matched @var{value}, the
+@var{split} is ignored. If none of the @var{restrict} clauses match,
+@var{split} is processed.
+
+The last element @var{invert-partial} is optional. If it is
+non-@code{nil}, the match-partial-words behavior controlled by the
+variable @code{nnmail-split-fancy-match-partial-words} (see below) is
+be inverted. (New in Gnus 5.10.7)
@item (| @var{split} @dots{})
If the split is a list, and the first element is @code{|} (vertical
@@ -14062,11 +14076,50 @@ If the split is @code{nil}, it is ignore
@end table
In these splits, @var{field} must match a complete field name.
-@var{value} must match a complete word according to the fundamental mode
-syntax table. You can use @code{.*} in the regexps to match partial
-field names or words. In other words, all @var{value}'s are wrapped in
-@samp{\<} and @samp{\>} pairs.
+Normally, @var{value} in these splits must match a complete @emph{word}
+according to the fundamental mode syntax table. In other words, all
+@var{value}'s will be implicitly surrounded by @code{\<...\>} markers,
+which are word delimiters. Therefore, if you use the following split,
+for example,
+
+@example
+(any "joe" "joemail")
+@end example
+
+@noindent
+messages sent from @samp{joedavis@(a)foo.org} will normally not be filed
+in @samp{joemail}. If you want to alter this behavior, you can use any
+of the following three ways:
+
+@enumerate
+@item
+@vindex nnmail-split-fancy-match-partial-words
+You can set the @code{nnmail-split-fancy-match-partial-words} variable
+to non-@code{nil} in order to ignore word boundaries and instead the
+match becomes more like a grep. This variable controls whether partial
+words are matched during fancy splitting. The default value is
+@code{nil}.
+
+Note that it influences all @var{value}'s in your split rules.
+
+@item
+@var{value} beginning with @code{.*} ignores word boundaries in front of
+a word. Similarly, if @var{value} ends with @code{.*}, word boundaries
+in the rear of a word will be ignored. For example, the @var{value}
+@code{"@(a)example\\.com"} does not match @samp{foo@(a)example.com} but
+@code{".*@(a)example\\.com"} does.
+
+@item
+You can set the @var{invert-partial} flag in your split rules of the
+@samp{(@var{field} @var{value} @dots{})} types, aforementioned in this
+section. If the flag is set, word boundaries on both sides of a word
+are ignored even if @code{nnmail-split-fancy-match-partial-words} is
+@code{nil}. Contrarily, if the flag is set, word boundaries are not
+ignored even if @code{nnmail-split-fancy-match-partial-words} is
+non-@code{nil}. (New in Gnus 5.10.7)
+@end enumerate
+
@vindex nnmail-split-abbrev-alist
@var{field} and @var{value} can also be Lisp symbols, in that case
they are expanded as specified by the variable
@@ -14113,25 +14166,6 @@ groups when users send to an address usi
(i.e. mailing-list@@domain vs Mailing-List@@Domain). The default value
is @code{t}.
-@vindex nnmail-split-fancy-match-partial-words
-@code{nnmail-split-fancy-match-partial-words} controls whether partial
-words are matched during fancy splitting.
-
-Normally, regular expressions given in @code{nnmail-split-fancy} are
-implicitly surrounded by @code{\<...\>} markers, which are word
-delimiters. If this variable is true, they are not implicitly
-surrounded by anything.
-
-@example
-(any "joe" "joemail")
-@end example
-
-In this example, messages sent from @samp{joedavis@(a)foo.org} will
-normally not be filed in @samp{joemail}. With
-@code{nnmail-split-fancy-match-partial-words} set to @code{t},
-however, the match will happen. In effect, the requirement of a word
-boundary is removed and instead the match becomes more like a grep.
-
@findex nnmail-split-fancy-with-parent
@code{nnmail-split-fancy-with-parent} is a function which allows you to
split followups into the same groups their parents are in. Sometimes
@@ -15886,6 +15920,10 @@ the value of @code{default-file-name-cod
XEmacs and want to use non-@acronym{ASCII} group names, you should set
the value for the @code{nnmail-pathname-coding-system} variable properly.
+The @code{nnrss} back end generates @samp{multipart/alternative}
+@acronym{MIME} articles in which each contains a @samp{text/plain} part
+and a @samp{text/html} part.
+
@cindex OPML
You can also use the following commands to import and export your
subscriptions from a file in @acronym{OPML} format (Outline Processor
@@ -15923,6 +15961,15 @@ If you set @code{nnrss-use-local} to @co
the feeds from local files in @code{nnrss-directory}. You can use
the command @code{nnrss-generate-download-script} to generate a
download script using @command{wget}.
+
+@item nnrss-wash-html-in-text-plain-parts
+Non-@code{nil} means that @code{nnrss} renders text in @samp{text/plain}
+parts as @acronym{HTML}. The function specified by the
+@code{mm-text-html-renderer} variable (@pxref{Display Customization,
+,Display Customization, emacs-mime, The Emacs MIME Manual}) will be used
+to render text. If it is @code{nil}, which is the default, text will
+simply be folded. Leave it @code{nil} if you prefer to see
+@samp{text/html} parts.
@end table
The following code may be helpful, if you want to show the description in
@@ -15940,6 +15987,7 @@ the summary buffer.
The following code may be useful to open an nnrss url directly from the
summary buffer.
+
@lisp
(require 'browse-url)
@@ -15962,6 +16010,31 @@ summary buffer.
(add-to-list 'nnmail-extra-headers nnrss-url-field)
@end lisp
+Even if you have added @code{"text/html"} to the
+@code{mm-discouraged-alternatives} variable (@pxref{Display
+Customization, ,Display Customization, emacs-mime, The Emacs MIME
+Manual}) since you don't want to see @acronym{HTML} parts, it might be
+more useful especially in @code{nnrss} groups to display
+@samp{text/html} parts. Here's an example of setting
+@code{mm-discouraged-alternatives} as a group parameter (@pxref{Group
+Parameters}) in order to display @samp{text/html} parts only in
+@code{nnrss} groups:
+
+@lisp
+;; @r{Set the default value of @code{mm-discouraged-alternatives}.}
+(eval-after-load "gnus-sum"
+ '(add-to-list
+ 'gnus-newsgroup-variables
+ '(mm-discouraged-alternatives
+ . '("text/html" "image/.*"))))
+
+;; @r{Display @samp{text/html} parts in @code{nnrss} groups.}
+(add-to-list
+ 'gnus-parameters
+ '("\\`nnrss:" (mm-discouraged-alternatives nil)))
+@end lisp
+
+
@node Customizing W3
@subsection Customizing W3
@cindex W3
@@ -21722,6 +21795,15 @@ There are some variables to customize, o
Set this variable to @code{t} to set the ball rolling. It is @code{nil}
by default.
+You can also set this variable to a positive number as a group level.
+In that case, Gnus scans NoCeM messages when checking new news if this
+value is not exceeding a group level that you specify as the prefix
+argument to some commands, e.g. @code{gnus},
+@code{gnus-group-get-new-news}, etc. Otherwise, Gnus does not scan
+NoCeM messages if you specify a group level to those commands. For
+example, if you use 1 or 2 on the mail groups and the levels on the news
+groups remain the default, 3 is the best choice.
+
@item gnus-nocem-groups
@vindex gnus-nocem-groups
Gnus will look for NoCeM messages in the groups in this list. The
@@ -22251,11 +22333,11 @@ default.
@item gnus-use-toolbar
@vindex gnus-use-toolbar
This variable specifies the position to display the toolbar. If
-@code{nil}, don't display toolbars. If it is non-nil, it should be one
-of the symbols @code{default}, @code{top}, @code{bottom}, @code{right},
-and @code{left}. @code{default} means to use the default toolbar, the
-rest mean to display the toolbar on the place which those names show.
-The default is @code{default}.
+@code{nil}, don't display toolbars. If it is non-@code{nil}, it should
+be one of the symbols @code{default}, @code{top}, @code{bottom},
+@code{right}, and @code{left}. @code{default} means to use the default
+toolbar, the rest mean to display the toolbar on the place which those
+names show. The default is @code{default}.
@item gnus-toolbar-thickness
@vindex gnus-toolbar-thickness
@@ -24502,15 +24584,18 @@ It was released as ``Gnus 5.6'' on March
Gnus 5.6 begat Pterodactyl Gnus on August 29th 1998 and was released as
``Gnus 5.8'' (after 99 releases and a CVS repository) on December 3rd
1999.
+
+On the 26th of October 2000, Oort Gnus was begun and was released as
+Gnus 5.10 on May 1st 2003 (24 releases).
-On the 26th of October 2000, Oort Gnus was begun.
+On the January 4th 2004, No Gnus was begun.
If you happen upon a version of Gnus that has a prefixed name --
``(ding) Gnus'', ``September Gnus'', ``Red Gnus'', ``Quassia
Gnus'',
-``Pterodactyl Gnus'', ``Oort Gnus'' -- don't panic. Don't let it
know
-that you're frightened. Back away. Slowly. Whatever you do, don't
-run. Walk away, calmly, until you're out of its reach. Find a proper
-released version of Gnus and snuggle up to that instead.
+``Pterodactyl Gnus'', ``Oort Gnus'', ``No Gnus'' -- don't
panic.
+Don't let it know that you're frightened. Back away. Slowly. Whatever
+you do, don't run. Walk away, calmly, until you're out of its reach.
+Find a proper released version of Gnus and snuggle up to that instead.
@node Other Gnus Versions
@@ -26174,6 +26259,8 @@ groups.
A new file from Raymond Scholz @email{rscholz@(a)zonix.de} for deuglifying
broken Outlook (Express) articles.
+@c FIXME: `gnus-load' is mentioned in README, which is not included in
+@c CVS. We should find a better place for this item.
@item
@code{(require 'gnus-load)}
@@ -26260,6 +26347,11 @@ Gnus supports the ``format=flowed'' (RFC
composing messages, it is enabled by @code{use-hard-newlines}.
Decoding format=flowed was present but not documented in earlier
versions.
+
+@item
+The option @code{mm-fill-flowed} can be used to disable treatment of
+``format=flowed'' messages. Also, flowed text is disabled when sending
+inline PGP signed messages. (New in Gnus 5.10.7)
@item
Gnus supports the generation of RFC 2298 Disposition Notification requests.
1.9 +18 -3 XEmacs/packages/xemacs-packages/gnus/texi/message.texi
Index: message.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/texi/message.texi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- message.texi 2005/12/19 13:35:33 1.8
+++ message.texi 2006/03/16 04:19:49 1.9
@@ -9,7 +9,7 @@
This file documents Message, the Emacs message composition mode.
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -1386,8 +1386,23 @@ trailing old subject. In this case,
@item message-alternative-emails
@vindex message-alternative-emails
-A regexp to match the alternative email addresses. The first matched
-address (not primary one) is used in the @code{From} field.
+Regexp matching alternative email addresses. The first address in the
+To, Cc or From headers of the original article matching this variable is
+used as the From field of outgoing messages, replacing the default From
+value.
+
+For example, if you have two secondary email addresses john@(a)home.net
+and john.doe@(a)work.com and want to use them in the From field when
+composing a reply to a message addressed to one of them, you could set
+this variable like this:
+
+@lisp
+(setq message-alternative-emails
+ (regexp-opt '("john@(a)home.net" "john.doe@(a)work.com")))
+@end lisp
+
+This variable has precedence over posting styles and anything that runs
+off @code{message-setup-hook}.
@item message-allow-no-recipients
@vindex message-allow-no-recipients