? Muttrc.head ? charmaps/Makefile.in ? charmaps/Makefile ? iconv/Makefile.in ? iconv/Makefile Index: color.c =================================================================== RCS file: /home/roessler/cvs/mutt/color.c,v retrieving revision 2.8 diff -u -r2.8 color.c --- mutt-1.3.20000609-orig/color.c 2000/03/07 11:18:56 2.8 +++ mutt-1.3.20000609/color.c 2000/06/09 18:59:07 @@ -29,6 +29,7 @@ int ColorQuoteUsed; int ColorDefs[MT_COLOR_MAX]; COLOR_LINE *ColorHdrList = NULL; +COLOR_LINE *ColorHdrPartList = NULL; COLOR_LINE *ColorBodyList = NULL; COLOR_LINE *ColorIndexList = NULL; @@ -82,6 +83,7 @@ { "tilde", MT_COLOR_TILDE }, { "markers", MT_COLOR_MARKERS }, { "header", MT_COLOR_HEADER }, + { "hdrpart", MT_COLOR_HDRPART }, { "body", MT_COLOR_BODY }, { "message", MT_COLOR_MESSAGE }, { "attachment", MT_COLOR_ATTACHMENT }, @@ -683,7 +685,8 @@ /* extract a regular expression if needed */ - if (object == MT_COLOR_HEADER || object == MT_COLOR_BODY || object == MT_COLOR_INDEX) + if (object == MT_COLOR_HEADER || object == MT_COLOR_HDRPART || + object == MT_COLOR_BODY || object == MT_COLOR_INDEX) { if (!MoreArgs (s)) { @@ -720,6 +723,8 @@ if (object == MT_COLOR_HEADER) r = add_pattern (&ColorHdrList, buf->data, 0, fg, bg, attr, err,0); + else if (object == MT_COLOR_HDRPART) + r = add_pattern (&ColorHdrPartList, buf->data, 1, fg, bg, attr, err, 0); else if (object == MT_COLOR_BODY) r = add_pattern (&ColorBodyList, buf->data, 1, fg, bg, attr, err, 0); else if (object == MT_COLOR_INDEX) Index: mutt_curses.h =================================================================== RCS file: /home/roessler/cvs/mutt/mutt_curses.h,v retrieving revision 2.3 diff -u -r2.3 mutt_curses.h --- mutt-1.3.20000609-orig/mutt_curses.h 2000/03/03 10:10:10 2.3 +++ mutt-1.3.20000609/mutt_curses.h 2000/06/09 18:59:07 @@ -109,6 +109,7 @@ MT_COLOR_MARKERS, MT_COLOR_BODY, MT_COLOR_HEADER, + MT_COLOR_HDRPART, MT_COLOR_MESSAGE, MT_COLOR_ATTACHMENT, MT_COLOR_SEARCH, @@ -134,6 +135,7 @@ extern int ColorQuoteUsed; extern int ColorDefs[]; extern COLOR_LINE *ColorHdrList; +extern COLOR_LINE *ColorHdrPartList; extern COLOR_LINE *ColorBodyList; extern COLOR_LINE *ColorIndexList; Index: pager.c =================================================================== RCS file: /home/roessler/cvs/mutt/pager.c,v retrieving revision 2.24 diff -u -r2.24 pager.c --- mutt-1.3.20000609-orig/pager.c 2000/05/15 12:00:53 2.24 +++ mutt-1.3.20000609/pager.c 2000/06/09 18:59:09 @@ -110,6 +110,7 @@ struct syntax_t *syntax; struct syntax_t *search; struct q_class_t *quote; + int def_color; }; #define ANSI_OFF (1<<0) @@ -197,7 +198,7 @@ if (!(flags & M_SHOWCOLOR)) def_color = ColorDefs[MT_COLOR_NORMAL]; else if (lineInfo[m].type == MT_COLOR_HEADER) - def_color = (lineInfo[m].syntax)[0].color; + def_color = lineInfo[m].def_color; else def_color = ColorDefs[lineInfo[m].type]; @@ -307,6 +308,7 @@ lineInfo[n+1].type = lineInfo[n].type; (lineInfo[n+1].syntax)[0].color = (lineInfo[n].syntax)[0].color; + lineInfo[n+1].def_color = lineInfo[n].def_color; lineInfo[n+1].continuation = 1; /* find the real start of the line */ @@ -713,6 +715,7 @@ { lineInfo[n].type = lineInfo[n-1].type; /* wrapped line */ (lineInfo[n].syntax)[0].color = (lineInfo[n-1].syntax)[0].color; + lineInfo[n].def_color = lineInfo[n-1].def_color; } else { @@ -723,7 +726,7 @@ if (REGEXEC (color_line->rx, buf) == 0) { lineInfo[n].type = MT_COLOR_HEADER; - lineInfo[n].syntax[0].color = color_line->pair; + lineInfo[n].def_color = color_line->pair; break; } color_line = color_line->next; @@ -797,7 +800,9 @@ /* body patterns */ if (lineInfo[n].type == MT_COLOR_NORMAL || - lineInfo[n].type == MT_COLOR_QUOTED) + lineInfo[n].type == MT_COLOR_QUOTED || + lineInfo[n].type == MT_COLOR_HDEFAULT || + lineInfo[n].type == MT_COLOR_HEADER) { i = 0; @@ -810,7 +815,9 @@ found = 0; null_rx = 0; - color_line = ColorBodyList; + color_line = lineInfo[n].type == MT_COLOR_NORMAL || + lineInfo[n].type == MT_COLOR_QUOTED ? ColorBodyList + : ColorHdrPartList; while (color_line) { if (regexec (&color_line->rx, buf + offset, 1, pmatch, @@ -1298,7 +1305,7 @@ { m = ((*lineInfo)[n].continuation) ? ((*lineInfo)[n].syntax)[0].first : n; if ((*lineInfo)[m].type == MT_COLOR_HEADER) - def_color = ((*lineInfo)[m].syntax)[0].color; + def_color = (*lineInfo)[m].def_color; else def_color = (*lineInfo)[m].type; Index: doc/manual.sgml.head =================================================================== RCS file: /home/roessler/cvs/mutt/doc/manual.sgml.head,v retrieving revision 1.37 diff -u -r1.37 manual.sgml.head --- mutt-1.3.20000609-orig/doc/manual.sgml.head 2000/06/04 18:18:56 1.37 +++ mutt-1.3.20000609/doc/manual.sgml.head 2000/06/09 18:59:17 @@ -973,8 +973,9 @@ body (match bold (hiliting bold patterns in the body of messages) error (error messages printed by Mutt) -header (match header (match hdrdefault (default color of the message header in the pager) +hdrpart (match index (match indicator (arrow or bar used to indicate the current item in a menu) markers (the ``+'' markers at the beginning of wrapped lines in the pager) Index: doc/muttrc.man.head =================================================================== RCS file: /home/roessler/cvs/mutt/doc/muttrc.man.head,v retrieving revision 1.8 diff -u -r1.8 muttrc.man.head --- mutt-1.3.20000609-orig/doc/muttrc.man.head 2000/06/08 12:20:21 1.8 +++ mutt-1.3.20000609/doc/muttrc.man.head 2000/06/09 18:59:19 @@ -139,8 +139,8 @@ If your terminal supports color, these commands can be used to assign \fIforeground\fP/\fIbackgound\fP combinations to certain objects. Valid objects are: -.BR attachment ", " body ", " bold ", " header ", " -.BR hdrdefault ", " index ", " indicator ", " markers ", " +.BR attachment ", " body ", " bold ", " header ", " hdrdefault ", " +.BR hdrpart ", " index ", " indicator ", " markers ", " .BR message ", " normal ", " quoted ", " quoted\fIN\fP ", " .BR search ", " signature ", " status ", " tilde ", " tree ", " .BR underline .