From cb734cd779eeacbf683b67142e04281155ebbc7f Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Wed, 12 Apr 2006 05:24:43 +0000 Subject: [PATCH] Revision: emacs@sv.gnu.org/gnus--devo--0--patch-117 Merge from gnus--rel--5.10 Patches applied: * emacs--devo--0 (patch 170-171, 174-176, 178, 182, 184, 187-189, 196, 198, 203, 210, 214) - Merge from gnus--rel--5.10 - Update from CVS: man/mh-e.texi (Folders): Various edits. - Update from CVS * gnus--rel--5.10 (patch 83-84) - Update from CVS - Merge from emacs--devo--0 --- etc/images/contact.pbm | Bin 0 -> 81 bytes etc/images/delete.pbm | Bin 0 -> 81 bytes etc/images/mail/inbox.pbm | Bin 0 -> 81 bytes etc/images/mail/move.pbm | Bin 0 -> 81 bytes etc/images/next-page.pbm | Bin 0 -> 81 bytes etc/images/refresh.xpm | 264 +++++++++++++++++++-------------- etc/images/sort-ascending.xpm | 90 +++++++---- etc/images/sort-descending.xpm | 79 ++++++---- lisp/ChangeLog | 22 ++- 9 files changed, 280 insertions(+), 175 deletions(-) create mode 100644 etc/images/contact.pbm create mode 100644 etc/images/delete.pbm create mode 100644 etc/images/mail/inbox.pbm create mode 100644 etc/images/mail/move.pbm create mode 100644 etc/images/next-page.pbm diff --git a/etc/images/contact.pbm b/etc/images/contact.pbm new file mode 100644 index 0000000000000000000000000000000000000000..64a50b50b83d22873ebc286d1a68edc85a2b3201 GIT binary patch literal 81 zcmWGA;W9E&Ff!p{fC2mee;gQ?{68=S2rvatI~0C_DI{!BNB~pl2d4NBOwmB`4NUQ$ QE&GLEMcCA#0d_T f4-8Cy7?|oAnB))euz#>%{_ud|a|44N0|Wp7-h&gb literal 0 HcmV?d00001 diff --git a/etc/images/mail/move.pbm b/etc/images/mail/move.pbm new file mode 100644 index 0000000000000000000000000000000000000000..b765cc2ed68797ae7458968bcab94835aba9d138 GIT binary patch literal 81 zcmWGA;W9E&Ff!p{fC14^1_g!&AP+(Q|Dnjh!ssBPsG!0q;3CS=!pP17WH17`4kC;U MEDZmDz;rVJ0IWv}k^lez literal 0 HcmV?d00001 diff --git a/etc/images/next-page.pbm b/etc/images/next-page.pbm new file mode 100644 index 0000000000000000000000000000000000000000..fbf7eaec0c3795ff4044ec27bbe634980d78cac8 GIT binary patch literal 81 zcmWGA;W9E&Ff!p{00aBuKN1Xh5*WaUg(rcHCxM+Op}q%10@*+jh!mKtfB(n+{~rbm Ih*l^G0E;3Im;e9( literal 0 HcmV?d00001 diff --git a/etc/images/refresh.xpm b/etc/images/refresh.xpm index fbf4ce8af..827ce3f2f 100644 --- a/etc/images/refresh.xpm +++ b/etc/images/refresh.xpm @@ -1,113 +1,153 @@ /* 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. ", -" .. ", -" . ", -" ", -" "}; +static char * refresh_xpm[] = { +"24 24 126 2", +" c None", +". c #000000", +"+ c #F0FFEE", +"@ c #CAE3C6", +"# c #F5FFF4", +"$ c #0D110C", +"% c #729C6C", +"& c #A6CAA1", +"* c #CBE4C7", +"= c #EFFDEE", +"- c #172116", +"; c #88B583", +"> c #CCE5C8", +", c #CDE6C9", +"' c #CFE7CB", +") c #F3FFF2", +"! c #7FA879", +"~ c #689063", +"{ c #CDE5C9", +"] c #CFE7CA", +"^ c #D0E9CC", +"/ c #D4EAD0", +"( c #D5ECD1", +"_ c #AED5A9", +": c #9ABC95", +"< c #63865F", +"[ c #2B3A29", +"} c #8CB887", +"| c #70986A", +"1 c #71986B", +"2 c #729A6B", +"3 c #759C6D", +"4 c #759F6F", +"5 c #76A170", +"6 c #567453", +"7 c #AFCBAC", +"8 c #7EAB77", +"9 c #78A472", +"0 c #6F9669", +"a c #70976A", +"b c #71996B", +"c c #739B6D", +"d c #759F6E", +"e c #77A170", +"f c #526F4C", +"g c #B7D2B2", +"h c #60835B", +"i c #A5C9A0", +"j c #9AC195", +"k c #4F6B4C", +"l c #769F70", +"m c #516D4C", +"n c #B9D5B4", +"o c #7BA574", +"p c #C7E0C3", +"q c #6D9568", +"r c #51714E", +"s c #B6D3B2", +"t c #81AB7C", +"u c #C3DBBF", +"v c #6B9265", +"w c #C8EFC3", +"x c #A7CCA2", +"y c #B5D2B1", +"z c #80A87A", +"A c #90B68B", +"B c #79A674", +"C c #C6EAC1", +"D c #DEF7D9", +"E c #B3D7AE", +"F c #BBD9B8", +"G c #AFCCAB", +"H c #749E6D", +"I c #5B7B57", +"J c #8CB087", +"K c #BBE1B6", +"L c #DAF5D6", +"M c #E1F7DD", +"N c #DCF4D6", +"O c #D7F0D3", +"P c #CFECCB", +"Q c #C6E3C3", +"R c #BCD6B9", +"S c #7EA778", +"T c #64885F", +"U c #A6C1A3", +"V c #B3D5AE", +"W c #CDEAC9", +"X c #D0EBCB", +"Y c #CAE9C5", +"Z c #C7E6C3", +"` c #C3E3BF", +" . c #BDDCBA", +".. c #B5D2B2", +"+. c #96B991", +"@. c #76A071", +"#. c #3A4E37", +"$. c #5E7F5A", +"%. c #8FAF8B", +"&. c #9CBE97", +"*. c #C7E0C4", +"=. c #CBE3C6", +"-. c #CDE4C9", +";. c #CBE4C8", +">. c #C7E1C4", +",. c #C2DBBF", +"'. c #88AF82", +"). c #6B9266", +"!. c #557451", +"~. c #63885E", +"{. c #759C70", +"]. c #749E6F", +"^. c #72996B", +"/. c #739A6D", +"(. c #71996C", +"_. c #6E9668", +":. c #6C9367", +"<. c #5F815A", +"[. c #70996B", +"}. c #6E9467", +"|. c #698F63", +"1. c #6B9166", +"2. c #5D8059", +"3. c #4D6A49", +"4. c #6A8F64", +"5. c #283926", +" . ", +" . . ", +" . + . ", +" . . . . @ # . ", +" $ % & @ @ * * = . . . ", +" - ; @ @ * * > , ' ) . . ! ~ . ", +" . % @ * * > { ] ^ / ( _ . . : < . ", +" [ & @ } | 1 2 3 4 5 6 . . 7 . ", +". 8 @ 9 0 a b c d e f . . g h . ", +". i j 0 k . . . l m . . . n o . ", +". p q h . . 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 ` ...+.@.#.. ", +" . $.%.. . &.*.=., -.;.>.,.'.).!.. ", +" . ~.{.. . ].^.c /.(.| _.:.<.. . ", +" . . . [.}.|.~ 1.2.3.. . ", +" . q 4.. . . . ", +" 5.).. ", +" . . ", +" . ", +" ", +" "}; diff --git a/etc/images/sort-ascending.xpm b/etc/images/sort-ascending.xpm index 5a47e5c5f..7f5a8806e 100644 --- a/etc/images/sort-ascending.xpm +++ b/etc/images/sort-ascending.xpm @@ -1,33 +1,61 @@ /* XPM */ -static char * stock_sort_ascending_xpm[] = { -"23 23 7 1", +static char * sort_ascending_xpm[] = { +"24 24 34 1", " c None", -". c #314E6C", -"+ c #000000", -"@ c #D1DECF", -"# c #7DA377", -"$ c #E4ECE3", -"% c #B3C9AF", -" ", -" .... ", -" .. .. ", -" .. .. ", -" ...... ", -" .. .. ", -" .. .. ", -" ", -" + ", -" ", -" + ", -" ", -" + + ", -" +@+ + ", -" +@##+ ++ ++++++ ", -" +###+$+ +++ ", -" +##%#+ +++ ", -" +%##+ +++ ", -" +$###+ +++ ", -" +++++++ ++++++ ", -" ", -" ", -" "}; +". c #000000", +"+ c #FAFAFA", +"@ c #DDDFD2", +"# c #8B8E7C", +"$ c #E5E7DD", +"% c #84A77E", +"& c #586546", +"* c #81A57C", +"= c #EDEEE8", +"- c #81A57B", +"; c #ECEDE6", +"> c #7EA379", +", c #7DA377", +"' c #DDDFD3", +") c #7DA378", +"! c #C9D5C4", +"~ c #7EA378", +"{ c #7C7E73", +"] c #DFE7DE", +"^ c #CCDACA", +"/ c #90B08C", +"( c #76986D", +"_ c #6C855E", +": c #22231E", +"< c #3F443B", +"[ c #C8D8C7", +"} c #9DB89A", +"| c #76966B", +"1 c #3D4237", +"2 c #565B4E", +"3 c #9EBA9A", +"4 c #3C4237", +"5 c #5E6154", +" ", +" ", +" ", +" .... ", +" ..... .. .. ", +" .+@#. .. .. ", +" .$%&. ...... ", +" .$*&. .. .. ", +" .=-&. .. .. ", +" .;-&. ", +" .$*&. .. ", +" .$*&. .. ", +" .$>&. ", +" .$,&. .. ", +" .')&. .. ", +" ...!~&... ", +" .{]^/(_:. ...... ", +" .<[}|1. ... ", +" .234. ... ", +" .5. ... ", +" . ... ", +" ...... ", +" ", +" "}; diff --git a/etc/images/sort-descending.xpm b/etc/images/sort-descending.xpm index 90127ac11..dddb6edac 100644 --- a/etc/images/sort-descending.xpm +++ b/etc/images/sort-descending.xpm @@ -1,33 +1,62 @@ /* XPM */ -static char * stock_sort_descending_xpm[] = { -"24 23 7 1", +static char * sort_descending_xpm[] = { +"24 24 35 1", " c None", ". c #000000", -"+ c #D1DECF", -"@ c #7DA377", -"# c #314E6C", -"$ c #E4ECE3", -"% c #B3C9AF", +"+ c #F8F0EE", +"@ c #E5B9BB", +"# c #895F63", +"$ c #E7BDBC", +"% c #C14B35", +"& c #922B34", +"* c #C24F3C", +"= c #942B32", +"- c #E8BFBE", +"; c #E8C2BF", +"> c #C34E3B", +", c #C24F3A", +"' c #C24D38", +") c #E5B8B9", +"! c #C24F38", +"~ c #E2B1AA", +"{ c #CC6B5A", +"] c #643C3E", +"^ c #E3B5AC", +"/ c #E3B3A9", +"( c #D07868", +"_ c #982E19", +": c #7E261F", +"< c #120C0F", +"[ c #2B1D1F", +"} c #DFAA9E", +"| c #D28575", +"1 c #7D2617", +"2 c #321C23", +"3 c #3B262E", +"4 c #D68A7A", +"5 c #321C21", +"6 c #3F2A35", " ", " ", -" ...... ", -" ... ", -" ... ", -" ... ", -" ... ", -" ...... ", -" . ", -" ", -" . ", -" ", -" . . ", -" .+. . ", -" .+@@. .. #### ", -" .@@@.$. ## ## ", -" .@@%@. ## ## ", -" .%@@. ###### ", -" .$@@@. ## ## ", -" ....... ## ## ", " ", +" ...... ", +" ..... ... ", +" .+@#. ... ", +" .$%&. ... ", +" .$*=. ... ", +" .-*=. ...... ", +" .;>=. ", +" .$*=. .. ", +" .$*=. .. ", +" .$,=. ", +" .$'=. .. ", +" .)!=. .. ", +" ...~{=... ", +" .]^/(_:<. .... ", +" .[}|12. .. .. ", +" .345. .. .. ", +" .6. ...... ", +" . .. .. ", +" .. .. ", " ", " "}; diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 85eddca70..676421a58 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -18,13 +18,6 @@ * gnus-uu.el (gnus-uu-save-article): Put mml tags instead of part tag to summarized topics part in order to encode non-ASCII text. -2006-04-12 Kenichi Handa - - * rfc2231.el (rfc2231-decode-encoded-string): Work on unibyte - buffer and then decode the buffer text if necessary. - (rfc2231-encode-string): Be sure to work on multibyte buffer at - first, and after mm-encode-body, change the buffer to unibyte. - 2006-04-11 Reiner Steib * smiley.el (smiley-style): New variable. @@ -203,6 +196,21 @@ * gnus-sum.el (gnus-map-articles): Don't funcall symbol macro. Reported by Ralf Wachinger . +<<<<<<< TREE +======= +2006-03-23 Kenichi Handa + + * rfc2231.el (rfc2231-encode-string): Use mm-disable-multibyte + instead of set-buffer-multibyte. + +2006-03-23 Kenichi Handa + + * rfc2231.el (rfc2231-decode-encoded-string): Work on unibyte + buffer and then decode the buffer text if necessary. + (rfc2231-encode-string): Be sure to work on multibyte buffer at + first, and after mm-encode-body, change the buffer to unibyte. + +>>>>>>> MERGE-SOURCE 2006-03-21 Simon Josefsson * pgg-gpg.el: Ideas below based on patch from Sascha Wilde -- 2.34.1