Author: hawk Date: Wed Jun 22 13:12:58 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 4.63, needs testing
---- Files affected:
SOURCES:
pine-iconv-9d.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/pine-iconv-9d.patch
diff -u SOURCES/pine-iconv-9d.patch:1.3 SOURCES/pine-iconv-9d.patch:1.4
--- SOURCES/pine-iconv-9d.patch:1.3 Wed Jul 21 12:05:16 2004
+++ SOURCES/pine-iconv-9d.patch Wed Jun 22 15:12:53 2005
@@ -1,6 +1,6 @@
-diff -urN pine4.61.orig/doc/iconv.txt pine4.61/doc/iconv.txt
---- pine4.61.orig/doc/iconv.txt 1970-01-01 01:00:00.000000000 +0100
-+++ pine4.61/doc/iconv.txt 2004-07-21 01:53:21.386532584 +0200
+diff -urN pine4.63.orig/doc/iconv.txt pine4.63/doc/iconv.txt
+--- pine4.63.orig/doc/iconv.txt 1970-01-01 00:00:00.000000000 +0000
++++ pine4.63/doc/iconv.txt 2005-06-22 12:04:30.033451072 +0000
@@ -0,0 +1,41 @@
+Relaease Notes for pine iconv/UTF-8 patch version 9d - Feb 04 2004
+------------------------------------------------------------------
@@ -43,9 +43,9 @@
+iconv-aliases=x-windows-949:mscp949,
+ euc-kr:mscp949
+
-diff -urN pine4.61.orig/doc/tech-notes/config.html
pine4.61/doc/tech-notes/config.html
---- pine4.61.orig/doc/tech-notes/config.html 2004-07-15 19:38:11.000000000
+0200
-+++ pine4.61/doc/tech-notes/config.html 2004-07-21 01:53:21.408529240
+0200
+diff -urN pine4.63.orig/doc/tech-notes/config.html
pine4.63/doc/tech-notes/config.html
+--- pine4.63.orig/doc/tech-notes/config.html 2005-04-20 23:20:27.000000000
+0000
++++ pine4.63/doc/tech-notes/config.html 2005-06-22 12:04:30.064446360
+0000
@@ -285,12 +285,14 @@
<DT> <A NAME="char-set"><EM>character-set</EM></A>
@@ -67,9 +67,9 @@
<DT> <A NAME="color-style"><EM>color-style</EM></A>
-diff -urN pine4.61.orig/doc/tech-notes/low-level.html
pine4.61/doc/tech-notes/low-level.html
---- pine4.61.orig/doc/tech-notes/low-level.html 2002-11-01
20:35:48.000000000 +0100
-+++ pine4.61/doc/tech-notes/low-level.html 2004-07-21 01:53:21.472519512
+0200
+diff -urN pine4.63.orig/doc/tech-notes/low-level.html
pine4.63/doc/tech-notes/low-level.html
+--- pine4.63.orig/doc/tech-notes/low-level.html 2002-11-01
19:35:48.000000000 +0000
++++ pine4.63/doc/tech-notes/low-level.html 2005-06-22 12:04:30.072445144
+0000
@@ -708,14 +708,23 @@
changed in the personal or system-wide configuration file with the
variable <A HREF="config.html#char-set"><EM>character-set</EM></A>. <P>
@@ -183,9 +183,9 @@
<HR>
-diff -urN pine4.61.orig/pico/composer.c pine4.61/pico/composer.c
---- pine4.61.orig/pico/composer.c 2004-07-21 01:52:33.000000000 +0200
-+++ pine4.61/pico/composer.c 2004-07-21 01:53:21.486517384 +0200
+diff -urN pine4.63.orig/pico/composer.c pine4.63/pico/composer.c
+--- pine4.63.orig/pico/composer.c 2005-06-22 12:03:46.000000000 +0000
++++ pine4.63/pico/composer.c 2005-06-22 12:04:30.086443016 +0000
@@ -344,7 +344,188 @@
return(TRUE);
}
@@ -384,7 +384,7 @@
(*term.t_flush)();
return(TRUE);
-@@ -1584,6 +1765,7 @@
+@@ -1596,6 +1777,7 @@
int skipmove = 0;
char *strng;
int last_key; /* last keystroke */
@@ -392,7 +392,7 @@
strng = ods.cur_l->text; /* initialize offsets */
ods.p_len = strlen(strng);
-@@ -1666,7 +1848,7 @@
+@@ -1678,7 +1860,7 @@
}
clearcursor();
@@ -401,7 +401,7 @@
if(ch == NODATA) /* GetKey timed out */
continue;
-@@ -1676,7 +1858,7 @@
+@@ -1688,7 +1870,7 @@
if(mpresf){ /* blast old messages */
if(mpresf++ > NMMESSDELAY){ /* every few keystrokes */
mlerase();
@@ -410,7 +410,7 @@
}
}
-@@ -1722,12 +1904,38 @@
+@@ -1734,12 +1916,38 @@
/*
* then find out where things fit...
@@ -450,7 +450,7 @@
if(pinsert(c)){ /* add char to str */
skipmove++; /* must'a been optimal */
continue; /* on to the next! */
-@@ -1764,6 +1972,7 @@
+@@ -1776,6 +1984,7 @@
}
}
else { /* interpret ch as a
command */
@@ -458,7 +458,7 @@
switch (ch = normalize_cmd(ch, ckm, 2)) {
case (CTRL|'\\') :
if (ch = GetAccent())
-@@ -1856,9 +2065,7 @@
+@@ -1868,9 +2077,7 @@
case (CTRL|'F') :
case KEY_RIGHT: /* move character right */
if(ods.p_off < ods.p_len){
@@ -469,7 +469,7 @@
continue;
}
else if(gmode & MDHDRONLY)
-@@ -1870,7 +2077,7 @@
+@@ -1882,7 +2089,7 @@
case (CTRL|'B') :
case KEY_LEFT : /* move character left */
if(ods.p_off > 0){
@@ -478,7 +478,7 @@
continue;
}
if(ods.p_line != COMPOSER_TOP_LINE)
-@@ -1905,7 +2112,8 @@
+@@ -1917,7 +2124,8 @@
continue;
}
@@ -488,7 +488,7 @@
case DEL : /* blast previous char */
case (CTRL|'H') :
-@@ -1919,20 +2127,27 @@
+@@ -1931,20 +2139,27 @@
continue;
}
@@ -521,7 +521,7 @@
}
else{ /* may have work to do */
if(ods.cur_l->prev == NULL){
-@@ -1943,18 +2158,16 @@
+@@ -1955,18 +2170,16 @@
ods.p_line--;
ods.cur_l = ods.cur_l->prev;
strng = ods.cur_l->text;
@@ -546,7 +546,7 @@
if((status = FormatLines(ods.cur_l, "", LINELEN(),
headents[ods.cur_e].break_on_comma,0))==-1){
(*term.t_beep)();
-@@ -1979,7 +2192,7 @@
+@@ -1991,7 +2204,7 @@
PaintBody(1);
}
@@ -555,7 +555,7 @@
if(skipmove)
continue;
-@@ -2004,7 +2217,8 @@
+@@ -2016,7 +2229,8 @@
void
HeaderPaintCursor()
{
@@ -565,9 +565,9 @@
}
-diff -urN pine4.61.orig/pico/display.c pine4.61/pico/display.c
---- pine4.61.orig/pico/display.c 2004-07-21 01:52:33.000000000 +0200
-+++ pine4.61/pico/display.c 2004-07-21 01:53:21.490516776 +0200
+diff -urN pine4.63.orig/pico/display.c pine4.63/pico/display.c
+--- pine4.63.orig/pico/display.c 2005-06-22 12:03:46.000000000 +0000
++++ pine4.63/pico/display.c 2005-06-22 12:04:30.092442104 +0000
@@ -1089,7 +1089,22 @@
}
}
@@ -591,9 +591,9 @@
/*
* Send a command to the terminal to move the hardware cursor to row "row"
-diff -urN pine4.61.orig/pico/efunc.h pine4.61/pico/efunc.h
---- pine4.61.orig/pico/efunc.h 2004-07-21 01:52:33.000000000 +0200
-+++ pine4.61/pico/efunc.h 2004-07-21 01:53:21.493516320 +0200
+diff -urN pine4.63.orig/pico/efunc.h pine4.63/pico/efunc.h
+--- pine4.63.orig/pico/efunc.h 2005-06-22 12:03:46.000000000 +0000
++++ pine4.63/pico/efunc.h 2005-06-22 12:04:30.094441800 +0000
@@ -118,6 +118,7 @@
extern VARS_TO_SAVE *save_pico_state PROTO((void));
extern void restore_pico_state PROTO((VARS_TO_SAVE *));
@@ -602,9 +602,9 @@
extern void HeaderPaintCursor PROTO((void));
extern void PaintBody PROTO((int));
-diff -urN pine4.61.orig/pico/pico.h pine4.61/pico/pico.h
---- pine4.61.orig/pico/pico.h 2004-07-21 01:52:33.000000000 +0200
-+++ pine4.61/pico/pico.h 2004-07-21 01:53:21.495516016 +0200
+diff -urN pine4.63.orig/pico/pico.h pine4.63/pico/pico.h
+--- pine4.63.orig/pico/pico.h 2005-06-22 12:03:46.000000000 +0000
++++ pine4.63/pico/pico.h 2005-06-22 12:04:30.098441192 +0000
@@ -373,7 +373,7 @@
#define P_HICTRL 0x80000000 /* overwrite mode */
#define P_CHKPTNOW 0x40000000 /* do the checkpoint on entry
*/
@@ -614,9 +614,9 @@
#define P_BODY 0x08000000 /* start composer in body
*/
#define P_HEADEND 0x04000000 /* start composer at end of
header */
#define P_VIEW MDVIEW /* read-only
*/
-diff -urN pine4.61.orig/pine/filter.c pine4.61/pine/filter.c
---- pine4.61.orig/pine/filter.c 2004-07-21 01:52:33.000000000 +0200
-+++ pine4.61/pine/filter.c 2004-07-21 03:05:27.500863240 +0200
+diff -urN pine4.63.orig/pine/filter.c pine4.63/pine/filter.c
+--- pine4.63.orig/pine/filter.c 2005-06-22 12:03:46.000000000 +0000
++++ pine4.63/pine/filter.c 2005-06-22 12:07:12.859697720 +0000
@@ -65,6 +65,9 @@
@@ -627,16 +627,15 @@
/*
-@@ -708,7 +711,7 @@
- #define FL_STF 16
+@@ -709,6 +712,7 @@
#define FL_SIG 17
#define STOP_DECODING 18
--
-+#define UTF8 19
+ #define SPACECR 19
++#define UTF8 20
- /*
-@@ -738,6 +741,13 @@
+
+@@ -739,6 +743,13 @@
unsigned char *GF_IP_INIT(FO); \
unsigned char *GF_EIB_INIT(FO);
@@ -650,7 +649,7 @@
#define GF_CH_RESET(F) (op = eob = GF_QUE_START(F), \
(F)->queueout = (F)->queuein = 0)
-@@ -2274,6 +2284,110 @@
+@@ -2270,6 +2281,110 @@
}
}
@@ -761,7 +760,7 @@
/*
* This filter converts characters in UTF-8 to an 8-bit or 16-bit charset.
-@@ -2377,6 +2491,7 @@
+@@ -2373,6 +2488,7 @@
f->n = 0L;
}
}
@@ -769,7 +768,7 @@
/*
-@@ -2904,6 +3019,7 @@
+@@ -2900,6 +3016,7 @@
unsigned strip:1; /* Hilite TAGs allowed */
unsigned handles_loc:1; /* Local handles requested? */
unsigned outputted:1; /* any */
@@ -777,7 +776,7 @@
} HTML_OPT_S;
-@@ -2915,6 +3031,7 @@
+@@ -2911,6 +3028,7 @@
#define HTML_WROTE(X) (HD(X)->wrote)
#define HTML_BASE(X) ((X)->opt ? ((HTML_OPT_S *)(X)->opt)->base :
NULL)
#define STRIP(X) ((X)->opt && ((HTML_OPT_S *)(X)->opt)->strip)
@@ -785,7 +784,7 @@
#define HANDLESP(X) (((HTML_OPT_S *)(X)->opt)->handlesp)
#define DO_HANDLES(X) ((X)->opt && HANDLESP(X))
#define HANDLES_LOC(X) ((X)->opt && ((HTML_OPT_S
*)(X)->opt)->handles_loc)
-@@ -4642,8 +4759,6 @@
+@@ -4638,8 +4756,6 @@
CENTER_BIT(hd->html_data) = 0;
hd->y = html_indent(hd->html_data, 0, HTML_ID_SET);
@@ -794,7 +793,7 @@
html_blank(hd->html_data, 1);
}
else if(cmd == GF_EOD){
-@@ -4656,7 +4771,6 @@
+@@ -4652,7 +4768,6 @@
html_indent(hd->html_data, hd->y, HTML_ID_SET);
html_blank(hd->html_data, 1);
CENTER_BIT(hd->html_data) = (hd->x & HTML_HX_CENTER) != 0;
@@ -802,7 +801,7 @@
}
return(1); /* get linked */
-@@ -4692,8 +4806,6 @@
+@@ -4688,8 +4803,6 @@
hd->x |= HTML_HX_ULINE;
CENTER_BIT(hd->html_data) = 0;
hd->y = html_indent(hd->html_data, 2, HTML_ID_SET);
@@ -811,7 +810,7 @@
html_blank(hd->html_data, 1);
}
else if(cmd == GF_EOD){
-@@ -4706,7 +4818,6 @@
+@@ -4702,7 +4815,6 @@
html_indent(hd->html_data, hd->y, HTML_ID_SET);
html_blank(hd->html_data, 1);
CENTER_BIT(hd->html_data) = (hd->x & HTML_HX_CENTER) != 0;
@@ -819,7 +818,7 @@
}
return(1); /* get linked */
-@@ -4732,8 +4843,6 @@
+@@ -4728,8 +4840,6 @@
hd->x = CENTER_BIT(hd->html_data); /* stop centering for now */
CENTER_BIT(hd->html_data) = 0;
hd->y = html_indent(hd->html_data, 4, HTML_ID_SET);
@@ -828,7 +827,7 @@
html_blank(hd->html_data, 1);
}
else if(cmd == GF_EOD){
-@@ -4743,7 +4852,6 @@
+@@ -4739,7 +4849,6 @@
html_indent(hd->html_data, (int) hd->y, HTML_ID_SET);
html_blank(hd->html_data, 1);
CENTER_BIT(hd->html_data) = hd->x;
@@ -836,7 +835,7 @@
}
return(1); /* get linked */
-@@ -4769,8 +4877,6 @@
+@@ -4765,8 +4874,6 @@
hd->x = CENTER_BIT(hd->html_data); /* stop centering for now */
CENTER_BIT(hd->html_data) = 0;
hd->y = html_indent(hd->html_data, 6, HTML_ID_SET);
@@ -845,7 +844,7 @@
html_blank(hd->html_data, 1);
}
else if(cmd == GF_EOD){
-@@ -4806,8 +4912,6 @@
+@@ -4802,8 +4909,6 @@
hd->x = CENTER_BIT(hd->html_data); /* stop centering for now */
CENTER_BIT(hd->html_data) = 0;
hd->y = html_indent(hd->html_data, 8, HTML_ID_SET);
@@ -854,7 +853,7 @@
html_blank(hd->html_data, 1);
}
else if(cmd == GF_EOD){
-@@ -4817,7 +4921,6 @@
+@@ -4813,7 +4918,6 @@
html_indent(hd->html_data, (int) hd->y, HTML_ID_SET);
html_blank(hd->html_data, 1);
CENTER_BIT(hd->html_data) = hd->x;
@@ -862,7 +861,7 @@
}
return(1); /* get linked */
-@@ -5769,7 +5872,7 @@
+@@ -5765,7 +5869,7 @@
f->data = (HTML_DATA_S *) fs_get(sizeof(HTML_DATA_S));
memset(f->data, 0, sizeof(HTML_DATA_S));
HD(f)->wrapstate = 1; /* start with flowing text */
@@ -871,7 +870,7 @@
f->f1 = DFL; /* state */
f->f2 = 0; /* chars in wrap buffer */
f->n = 0L; /* chars on line so far */
-@@ -5929,7 +6032,7 @@
+@@ -5925,7 +6029,7 @@
if(HD(f)->prefix)
html_a_prefix(f);
@@ -880,7 +879,7 @@
HTML_LINEP_PUTC(f, ch & 0xff);
HTML_FLUSH(f);
html_newline(f);
-@@ -6172,7 +6275,7 @@
+@@ -6168,7 +6272,7 @@
/* ch is start of next word */
HD(f)->centered->space = 0;
@@ -889,7 +888,7 @@
html_centered_flush(f);
html_centered_putc(&HD(f)->centered->word, ch);
-@@ -6561,6 +6664,7 @@
+@@ -6557,6 +6661,7 @@
op->columns = columns - (margin_l + margin_r);
op->strip = ((flags & GFHP_STRIPPED) == GFHP_STRIPPED);
op->handlesp = handlesp;
@@ -897,7 +896,7 @@
op->handles_loc = ((flags & GFHP_LOCAL_HANDLES) == GFHP_LOCAL_HANDLES);
return((void *) op);
}
-@@ -6768,9 +6872,11 @@
+@@ -6764,9 +6869,11 @@
state,
wrap_col,
wrap_max,
@@ -909,7 +908,7 @@
char special[256];
long curlinenum; /* current line number */
int curqstrpos; /* current position in quote string */
-@@ -6781,8 +6887,9 @@
+@@ -6777,8 +6884,9 @@
#define WRAP_MARG_L(F) (((WRAP_S *)(F)->opt)->margin_l)
#define WRAP_MARG_R(F) (((WRAP_S *)(F)->opt)->margin_r)
@@ -921,7 +920,7 @@
#define WRAP_INDENT(F) (((WRAP_S *)(F)->opt)->indent)
#define WRAP_DO_IND(F) (((WRAP_S *)(F)->opt)->do_indent)
#define WRAP_COMMA(F) (((WRAP_S *)(F)->opt)->on_comma)
-@@ -6874,7 +6981,8 @@
+@@ -6877,7 +6985,8 @@
GF_INIT(f, f->next);
if(flg == GF_DATA){
@@ -931,7 +930,7 @@
register int state = f->f1;
register int x;
-@@ -7309,8 +7417,42 @@
+@@ -7318,8 +7427,42 @@
break;
@@ -974,7 +973,7 @@
if(WRAP_SPEC(f, c)){
switch(c){
default :
-@@ -7541,9 +7683,10 @@
+@@ -7550,9 +7693,10 @@
while(WRAP_INDENT(f) >= WRAP_MAX_COL(f))
WRAP_INDENT(f) /= 2;
@@ -987,9 +986,9 @@
for(i = 0; i < 256; i++)
((WRAP_S *) f->opt)->special[i] = ((i == '\"' && WRAP_COMMA(f))
-diff -urN pine4.61.orig/pine/init.c pine4.61/pine/init.c
---- pine4.61.orig/pine/init.c 2004-07-21 01:52:33.000000000 +0200
-+++ pine4.61/pine/init.c 2004-07-21 01:53:21.555506896 +0200
+diff -urN pine4.63.orig/pine/init.c pine4.63/pine/init.c
+--- pine4.63.orig/pine/init.c 2005-06-22 12:03:46.000000000 +0000
++++ pine4.63/pine/init.c 2005-06-22 12:04:30.169430400 +0000
@@ -253,6 +253,16 @@
CONF_TXT_T cf_text_character_set[] = "Reflects capabilities of the display
you have. Default: US-ASCII.\n# Typical alternatives include ISO-8859-x, (x is
a number between 1 and 9).";
@@ -1007,9 +1006,9 @@
CONF_TXT_T cf_text_editor[] = "Specifies the program invoked by ^_ in
the Composer,\n# or the \"enable-alternate-editor-implicitly\" feature.";
CONF_TXT_T cf_text_speller[] = "Specifies the program invoked
by ^T in the Composer.";
-@@ -599,6 +609,18 @@
+@@ -609,6 +619,18 @@
cf_text_startup_rules},
- {"character-set", 0, 1, 0, 1, 1, 0, 0, 0, 0, 0,
+ {"character-set", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1,
cf_text_character_set},
+#ifdef HAVE_ICONV
+{"send-charset", 0, 1, 0, 1, 1, 0, 0, 0, 0, 0,
@@ -1025,8 +1024,8 @@
+#endif
{"editor", 0, 1, 0, 1, 1, 1, 0, 0, 0, 1,
cf_text_editor},
- {"speller", 0, 1, 0, 1, 1, 0, 0, 0, 0, 0,
-@@ -2193,6 +2215,9 @@
+ {"speller", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1,
+@@ -2218,6 +2240,9 @@
set_current_val(&vars[V_OLD_STYLE_REPLY], TRUE, TRUE);
obs_old_style_reply = !strucmp(VAR_OLD_STYLE_REPLY, "yes");
@@ -1036,7 +1035,7 @@
set_feature_list_current_val(&vars[V_FEATURE_LIST]);
process_feature_list(ps, VAR_FEATURE_LIST,
(obs_feature_level == Seasoned) ? 1 : 0,
-@@ -2200,7 +2225,12 @@
+@@ -2225,7 +2250,12 @@
set_current_val(&vars[V_SIGNATURE_FILE], TRUE, TRUE);
set_current_val(&vars[V_LITERAL_SIG], TRUE, TRUE);
@@ -1050,7 +1049,7 @@
set_current_val(&vars[V_GLOB_ADDRBOOK], TRUE, TRUE);
set_current_val(&vars[V_ADDRESSBOOK], TRUE, TRUE);
set_current_val(&vars[V_FORCED_ABOOK_ENTRY], TRUE, TRUE);
-@@ -3230,6 +3260,9 @@
+@@ -3295,6 +3325,9 @@
#else
ps->pass_ctrl_chars = F_ON(F_PASS_CONTROL_CHARS,ps_global) ? 1 : 0;
ps->pass_c1_ctrl_chars = F_ON(F_PASS_C1_CONTROL_CHARS,ps_global) ? 1 : 0;
@@ -1060,11 +1059,11 @@
if(F_ON(F_QUELL_BEZERK_TIMEZONE,ps_global))
mail_parameters(NULL, SET_NOTIMEZONES, (void *) 1);
-diff -urN pine4.61.orig/pine/mailindx.c pine4.61/pine/mailindx.c
---- pine4.61.orig/pine/mailindx.c 2004-07-21 01:52:34.000000000 +0200
-+++ pine4.61/pine/mailindx.c 2004-07-21 02:48:43.996419104 +0200
-@@ -2257,10 +2257,11 @@
- drew_X++;
+diff -urN pine4.63.orig/pine/mailindx.c pine4.63/pine/mailindx.c
+--- pine4.63.orig/pine/mailindx.c 2005-06-22 12:03:46.000000000 +0000
++++ pine4.63/pine/mailindx.c 2005-06-22 12:34:18.517560160 +0000
+@@ -2302,10 +2302,11 @@
+ draw[acol+i] = '>';
}
- if(pcol >= 0 && pcol < cols){
@@ -1079,7 +1078,7 @@
if(h->offs[0].offset < 0 || h->offs[0].offset >= cols){
/* no special color, draw from 0 to end */
-@@ -2367,6 +2368,10 @@
+@@ -2456,6 +2457,10 @@
EndInverse();
}
}
@@ -1089,17 +1088,18 @@
+ }
done_drawing:
- if(drew_X)
-@@ -2378,8 +2383,6 @@
- if(cur)
+ draw[scol] = save_schar1;
+@@ -2467,9 +2472,6 @@
+ if(!ac && cur)
EndInverse();
- if(pcol >= 0 && pcol < cols)
- draw[pcol] = save_pchar;
- }
+-
+ if(do_arrow && cur){
+ int i;
- if(base_color && base_color != lastc && base_color != &h->linecolor)
-@@ -4469,6 +4472,58 @@
+@@ -4627,6 +4629,58 @@
return(doy);
}
@@ -1158,7 +1158,7 @@
/*----------------------------------------------------------------------
-@@ -4485,7 +4540,8 @@
+@@ -4643,7 +4697,8 @@
format_index_index_line(idata)
INDEXDATA_S *idata;
{
@@ -1166,9 +1166,9 @@
+#define STRLEN MAX_SCREEN_COLS*6
+ char str_buf[MAXIFLDS][STRLEN+1], to_us, status, *field,
*buffer, *s_tmp, *p, *str, *newsgroups;
- int width, offsets_set = 0, i, j, smallest, which_array =
0;
- int plus_off = -1, imp_off = -1, del_off = -1, ans_off = -1,
-@@ -4794,7 +4850,7 @@
+ int width, i, j, smallest, which_array = 0, collapsed = 0,
+ offsets_set = 0, cur_offset = 0, noff = 0, noff_was;
+@@ -5128,7 +5183,7 @@
case iFrom:
case iAddress:
case iMailbox:
@@ -1177,21 +1177,49 @@
break;
case iTo:
-@@ -5111,11 +5167,11 @@
+@@ -5445,12 +5500,12 @@
break;
case iSubject:
-- subj_str(idata, width, str, 0);
-+ subj_str(idata, min(width*6,STRLEN), str, 0);
+- subj_str(idata, width, str, NoKW, NULL, NULL);
++ subj_str(idata, min(width*6,STRLEN), str, NoKW, NULL, NULL);
break;
case iSubjKey:
-- subj_str(idata, width, str, 1);
-+ subj_str(idata, min(width*6,STRLEN), str, 1);
- break;
-
- case iNews:
-@@ -5248,7 +5304,6 @@
+ noff_was = noff;
+- subj_str(idata, width, str, KW, hline->offs, &noff);
++ subj_str(idata, min(width*6,STRLEN), str, KW, hline->offs,
&noff);
+ /* fix offsets which are now relative to str */
+ for(i = noff_was; i < noff; i++)
+ if(hline->offs[i].offset >= 0)
+@@ -5460,7 +5515,7 @@
+
+ case iSubjKeyInit:
+ noff_was = noff;
+- subj_str(idata, width, str, KWInit, hline->offs, &noff);
++ subj_str(idata, min(width*6,STRLEN), str, KWInit, hline->offs,
&noff);
+ /* fix offsets which are now relative to str */
+ for(i = noff_was; i < noff; i++)
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/pine-iconv-9d.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
