home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
OS/2 Shareware BBS: 5 Edit
/
05-Edit.zip
/
ftes46b5.zip
/
ftes46b5
/
config
/
m_diff.fte
< prev
next >
Wrap
Text File
|
1997-05-30
|
2KB
|
64 lines
colorize DIFF {
SyntaxParser = 'SIMPLE';
color {
{ 'Normal', 'DIFF_Default' },
{ 'Old', 'DIFF_Old' },
{ 'New', 'DIFF_New' },
{ 'Changed', 'DIFF_Changed' },
};
h_state 0 { 'Normal' }
h_trans { 1, '^<s', '+>', 'New' }
h_trans { 2, '^<s', '-<', 'Old' }
h_trans { 3, '^<', '!', 'Changed' }
h_state 1 { 'New' }
h_trans { 0, '$', '', 'Normal' }
h_state 2 { 'Old' }
h_trans { 0, '$', '', 'Normal' }
h_state 3 { 'Changed' }
h_trans { 0, '$', '', 'Normal' }
}
colorize MERGE {
SyntaxParser = 'SIMPLE';
color {
{ 'Normal', 'MERGE_Default' },
{ 'Changed', 'MERGE_Changed' },
{ 'Old', 'MERGE_Old' },
{ 'New', 'MERGE_New' },
{ 'Control', 'MERGE_Control' },
};
h_state 0 { 'Normal' }
h_trans { 1, '^<', '<<<<<<<', 'Control' }
h_state 1 { 'Changed' }
h_trans { 2, '^>', '|||||||', 'Control' }
h_trans { 3, '^>', '=======', 'Control' }
h_state 2 { 'Old' }
h_trans { 3, '^>', '=======', 'Control' }
h_state 3 { 'New' }
h_trans { 0, '^>', '>>>>>>>', 'Control' }
}
mode DIFF: PLAIN { # unix/gnu diff
FileNameRx = /\.\c{DIFF?}$/;
FirstLineRx = /^diff /;
HilitOn = 1;
Colorizer = 'DIFF';
MultiLineHilit = 0;
}
mode MERGE: PLAIN { # unix/gnu rscmerge
FileNameRx = /\.\cMRG$/;
HilitOn = 1;
Colorizer = 'MERGE';
MultiLineHilit = 0;
}