*** file.c 1997/11/18 00:41:24 1.6 --- file.c 1997/11/29 06:14:20 1.7 *************** *** 289,292 **** #else fp = fopen(fullname, "r+"); ! if (fp == NULL && errno == EACCES) { readOnly = TRUE; --- 289,294 ---- #else + /* Try to open read/write */ fp = fopen(fullname, "r+"); ! /* If that failed then try read-only */ ! if (fp == NULL) { readOnly = TRUE; *** highlight.c 1997/11/03 07:24:50 1.6 --- highlight.c 1997/11/29 06:11:31 1.7 *************** *** 63,64 **** --- 63,68 ---- + #ifdef PURIFY + # define _BufGetCharacter BufGetCharacter + #endif + /* How much re-parsing to do when an unfinished style is encountered */ *************** *** 292,294 **** memset(stylePtr, UNFINISHED_STYLE, window->editorInfo->buffer->length); ! *stylePtr += window->editorInfo->buffer->length; } else { --- 296,298 ---- memset(stylePtr, UNFINISHED_STYLE, window->editorInfo->buffer->length); ! stylePtr += window->editorInfo->buffer->length; } else { *** highlightData.c 1997/11/03 07:45:40 1.6 --- highlightData.c 1997/11/29 06:20:22 1.7 *************** *** 202,204 **** braces:\"[{}]\":::Keyword::D}", ! "C++:1:0 {\n\ comment:\"/\\*\":\"\\*/\"::Comment::\n\ --- 202,204 ---- braces:\"[{}]\":::Keyword::D}", ! "C++:1:0{\n\ comment:\"/\\*\":\"\\*/\"::Comment::\n\ *************** *** 216,218 **** braces:\"[{}]\":::Keyword::D}", ! "HTML:1:0 {\n\ special chars:\"\\&[-.a-zA-Z0-9#]*;?\":::Text Escape::\n\ --- 216,218 ---- braces:\"[{}]\":::Keyword::D}", ! "HTML:1:0{\n\ special chars:\"\\&[-.a-zA-Z0-9#]*;?\":::Text Escape::\n\ *************** *** 224,226 **** brackets:\"\\1\":\"\\0\"::Text Arg:element:C}", ! "Java:1:0 {\n\ comment:\"/\\*\":\"\\*/\"::Comment::\n\ --- 224,226 ---- brackets:\"\\1\":\"\\0\"::Text Arg:element:C}", ! "Java:1:0{\n\ comment:\"/\\*\":\"\\*/\"::Comment::\n\ *************** *** 260,293 **** #endif /*VMS*/ ! "Perl:1:0{\n\ ! escaped characters:\"\\\\[\\\\\"\"$`']\":::Escaped Items::\n\ ! double quote strings:\"\"\"\":\"\"\"\":\"\\n\":Double Quoted String::\n\ ! dq escapes:\"\\\\(.|\\n)\":::Escaped Items:double quote strings:\n\ ! dq variables:\"\\$[^a-zA-Z0-9_ \\t\\n{]|\\$[0-9]+|[$@%][a-zA-Z_][a-zA-Z0-9_]*\":::Identifier:double quote strings:\n\ ! single quote strings:\"'\":\"'\":\"\\n\":Single Quoted String::\n\ ! sq escapes:\"\\\\'\":::Escaped Items:single quote strings:\n\ ! command substitution:\"`\":\"`\":\"\\n\":Single Quoted String::\n\ ! cs variables:\"\\$[^a-zA-Z0-9_ \\t\\n{]|\\$[0-9]+|[$@%][a-zA-Z_][a-zA-Z0-9_]*\":::Identifier:command substitution:\n\ ! cs escapes:\"\\\\(.|\\n)\":::Escaped Items:command substitution:\n\ ! numeric constants:\"<((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f)?>\":::Numeric Const::D\n\ ! comments:\"#\":\"$\"::Comment::\n\ ! subroutine header:\"sub[\\t ]+([a-zA-Z_][a-zA-Z0-9_]*)\":::Keyword::\n\ ! subr header coloring:\"\\1\":\"\"::Subroutine:subroutine header:C\n\ ! re matching:\"<((m|q|qq)?/)\":\"(/[gimsox]?)>\":\"\\n\":Double Quoted String::\n\ ! re match coloring:\"\\1\":\"\\1\"::Operators:re matching:C\n\ ! re match escapes:\"\\\\(.|\\n)\":::Escaped Items:re matching:\n\ ! re match variables:\"\\$[^a-zA-Z0-9_ /\\t\\n{]|\\$[0-9]+|[$@%][a-zA-Z_][a-zA-Z0-9_]*\":::Identifier:re matching:\n\ ! re substitution:\"<((s|y|tr)/)\":\"(/[gimsox]?)>\":\"\\n\":Double Quoted String::\n\ ! re sub escapes:\"\\\\(.|\\n)\":::Escaped Items:re substitution:\n\ ! re sub slash:\"/\":::Operators:re substitution:\n\ ! re sub variables:\"\\$[^a-zA-Z0-9_ /\\t\\n{]|\\$[0-9]+|[$@%][a-zA-Z_][a-zA-Z0-9_]*\":::Identifier:re substitution:\n\ ! re sub coloring:\"\\1\":\"\\1\"::Operators:re substitution:C\n\ ! keywords:\"<(my|local|new|if|until|while|elsif|else|eval|unless|for|foreach|continue|last|goto|next|redo|return|do|use|require|package|eval|BEGIN|END)>\":::Keyword::D\n\ ! library fns:\"<(abs|accept|alarm|atan2|bind|binmode|bless|caller|chdir|chmod|chomp|chop|chr|chroot|chown|closedir|close|connect|cos|crypt|dbmclose|dbmopen|defined|delete|die|dump|each|endgrent|endhostent|endnetent|endprotoent|endpwent|endservent|eof|exec|exists|exit|exp|fctnl|fileno|flock|fork|format|formline|getc|getgrent|getgrgid|getgrnam|gethostbyaddr|gethostbyname|gethostent|getlogin|getnetbyaddr|getnetbyname|getnetent|getpeername|getpgrp|getppid|getpriority|getprotobyname|getprotobynumber|getprotoent|getpwent|getpwnam|getpwuid|getservbyname|getservbyport|getservent|getsockname|getsockopt|glob|gmtime|grep|hex|import|index|int|ioctl|join|keys|kill|lcfirst|lc|length|link|listen|log|localtime|lstat|map|mkdir|msgctl|msgget|msgrcv|no|oct|opendir|open|ord|pack|pipe|pop|pos|printf|print|push|quotemeta|rand|readdir|read|readlink|recv|ref|rename|reset|reverse|rewinddir|rindex|rmdir|scalar|seekdir|seek|select|semctl|semget|semop|send|setgrent|sethostent|setnetent|setpgrp|setpriority|setprotoent|setpwent|setsockopt|shift|shmctl|shmget|shmread|shmwrite|shutdown|sin|sleep|socket|socketpair|sort|splice|split|sprintf|sqrt|srand|stat|study|substr|symlink|syscall|sysopen|sysread|system|syswrite|telldir|tell|tie|tied|time|times|truncate|uc|ucfirst|umask|undef|unlink|unpack|unshift|untie|utime|values|vec|wait|waitpid|wantarray|warn|write)>\":::Library Function::D\n\ ! operators:\"<(not|or|xor|eq|ne|lt|gt|le|ge|cmp|qw|-[rwxRWXoOezsfdlSpbcugktTBMAC])>|(\\<=\\>|&&|\\|\\||==|!=|\\<=|\\>=|!|=\\>|=~|!~|\\>|\\<|::|-\\>|<[.&|?:=]>)\":::Operators::D\n\ ! subroutine call 1:\"&[a-zA-Z_][a-zA-Z0-9_]*|&?([a-zA-Z_][a-zA-Z0-9_]*::)?[a-zA-Z_][a-zA-Z0-9_]*[ \\t]*(\\()\":::Subroutine::D\n\ ! subroutine call 1 paren:\"\\2\":\"\"::Keyword:subroutine call 1:DC\n\ ! package variables:\"[$@%][a-zA-Z_][a-zA-Z0-9_]*::[a-zA-Z_][a-zA-Z0-9_]*\":::Identifier1::\n\ ! variables:\"\\$[^a-zA-Z0-9_ \\t\\n{]|\\$[0-9]+|[$@%][a-zA-Z_][a-zA-Z0-9_]*\":::Identifier::\n\ ! delimiters:\"[\\[\\]{}\\(\\);,]\":::Delimiters::D\n\ ! }", "Ada:1:0{\n\ --- 260,301 ---- #endif /*VMS*/ ! "Perl:1:0{\n\ ! escaped characters:\"\\\\[\\\\\"\"$`']\":::Escaped Items::\n\ ! EOF dq here doc:\"<\":::Numeric Const::D\n\ ! comments:\"#\":\"$\"::Comment::\n\ ! subroutine header:\"sub[\\t ]+([a-zA-Z_][a-zA-Z0-9_]*)\":::Keyword::\n\ ! subr header coloring:\"\\1\":\"\"::Subroutine:subroutine header:C\n\ ! re matching:\"<((m|q|qq)?/)\":\"(/[gimsox]?)>\":\"\\n\":Double Quoted String::\n\ ! re match coloring:\"\\1\":\"\\1\"::Operators:re matching:C\n\ ! re match escapes:\"\\\\(.|\\n)\":::Escaped Items:re matching:\n\ ! re match variables:\"\\$[^a-zA-Z0-9_ /\\t\\n{]|\\$[0-9]+|[$@%][a-zA-Z_][a-zA-Z0-9_]*\":::Identifier:re matching:\n\ ! re substitution:\"<((s|y|tr)/)\":\"(/[gimsox]?)>\":\"\\n\":Double Quoted String::\n\ ! re sub escapes:\"\\\\(.|\\n)\":::Escaped Items:re substitution:\n\ ! re sub slash:\"/\":::Operators:re substitution:\n\ ! re sub variables:\"\\$[^a-zA-Z0-9_ /\\t\\n{]|\\$[0-9]+|[$@%][a-zA-Z_][a-zA-Z0-9_]*\":::Identifier:re substitution:\n\ ! re sub coloring:\"\\1\":\"\\1\"::Operators:re substitution:C\n\ ! keywords:\"<(my|local|new|if|until|while|elsif|else|eval|unless|for|foreach|continue|last|goto|next|redo|return|do|use|require|package|eval|BEGIN|END)>\":::Keyword::D\n\ ! library fns:\"<(abs|accept|alarm|atan2|bind|binmode|bless|caller|chdir|chmod|chomp|chop|chr|chroot|chown|closedir|close|connect|cos|crypt|dbmclose|dbmopen|defined|delete|die|dump|each|endgrent|endhostent|endnetent|endprotoent|endpwent|endservent|eof|exec|exists|exit|exp|fctnl|fileno|flock|fork|format|formline|getc|getgrent|getgrgid|getgrnam|gethostbyaddr|gethostbyname|gethostent|getlogin|getnetbyaddr|getnetbyname|getnetent|getpeername|getpgrp|getppid|getpriority|getprotobyname|getprotobynumber|getprotoent|getpwent|getpwnam|getpwuid|getservbyname|getservbyport|getservent|getsockname|getsockopt|glob|gmtime|grep|hex|import|index|int|ioctl|join|keys|kill|lcfirst|lc|length|link|listen|log|localtime|lstat|map|mkdir|msgctl|msgget|msgrcv|no|oct|opendir|open|ord|pack|pipe|pop|pos|printf|print|push|quotemeta|rand|readdir|read|readlink|recv|ref|rename|reset|reverse|rewinddir|rindex|rmdir|scalar|seekdir|seek|select|semctl|semget|semop|send|setgrent|sethostent|setnetent|setpgrp|setpriority|setprotoent|setpwent|setsockopt|shift|shmctl|shmget|shmread|shmwrite|shutdown|sin|sleep|socket|socketpair|sort|splice|split|sprintf|sqrt|srand|stat|study|substr|symlink|syscall|sysopen|sysread|system|syswrite|telldir|tell|tie|tied|time|times|truncate|uc|ucfirst|umask|undef|unlink|unpack|unshift|untie|utime|values|vec|wait|waitpid|wantarray|warn|write)>\":::Library Function::D\n\ ! operators:\"<(not|or|xor|eq|ne|lt|gt|le|ge|cmp|qw|-[rwxRWXoOezsfdlSpbcugktTBMAC])>|(\\<=\\>|&&|\\|\\||==|!=|\\<=|\\>=|!|=\\>|=~|!~|\\>|\\<|::|-\\>|<[.&|?:=]>)\":::Operators::D\n\ ! subroutine call 1:\"&[a-zA-Z_][a-zA-Z0-9_]*|&?([a-zA-Z_][a-zA-Z0-9_]*::)?[a-zA-Z_][a-zA-Z0-9_]*[ \\t]*(\\()\":::Subroutine::D\n\ ! subroutine call 1 paren:\"\\2\":\"\"::Keyword:subroutine call 1:DC\n\ ! package variables:\"[$@%][a-zA-Z_][a-zA-Z0-9_]*::[a-zA-Z_][a-zA-Z0-9_]*\":::Identifier1::\n\ ! variables:\"\\$[^a-zA-Z0-9_ \\t\\n{]|\\$[0-9]+|[$@%][a-zA-Z_][a-zA-Z0-9_]*\":::Identifier::\n\ ! delimiters:\"[\\[\\]{}\\(\\);,]\":::Delimiters::D\n\ ! pod:\"^(=.*)\\n\":\"(=cut)\"::Text Comment::\n\ ! pod keyword:\"=.*\\n\":::Text Key:pod:\n\ ! pod keyword 2:\"\\1\":\"\\1\"::Text Key:pod:C}", "Ada:1:0{\n\ *************** *** 305,307 **** Dot All:\"\\\\.[aA][lL][lL]>\":::Storage Type::D}", ! "Fortran:2:0 {\n\ Comment:\"^[Cc*!]\":\"$\"::Comment::\n\ --- 313,315 ---- Dot All:\"\\\\.[aA][lL][lL]>\":::Storage Type::D}", ! "Fortran:2:0{\n\ Comment:\"^[Cc*!]\":\"$\"::Comment::\n\ *************** *** 315,317 **** Continuation in String:\"\\n( [^ \\t0]|( | | | )?\\t[1-9])\":::Flag:String:}", ! "Tcl:1:0 {\n\ Comment:\"#\":\"$\"::Comment::\n\ --- 323,325 ---- Continuation in String:\"\\n( [^ \\t0]|( | | | )?\\t[1-9])\":::Flag:String:}", ! "Tcl:1:0{\n\ Comment:\"#\":\"$\"::Comment::\n\ *************** *** 326,328 **** Variable in String:\"\\$[0-9a-zA-Z_]+|\\${[^}]*}|\\$\":::Identifier1:Double Quote String:}", ! "Pascal:1:0 {\n\ Comment 1:\"<(/\\*|\\(\\*)>\":\"<(\\*/|\\*\\))>\"::Comment::\n\ --- 334,336 ---- Variable in String:\"\\$[0-9a-zA-Z_]+|\\${[^}]*}|\\$\":::Identifier1:Double Quote String:}", ! "Pascal:1:0{\n\ Comment 1:\"<(/\\*|\\(\\*)>\":\"<(\\*/|\\*\\))>\"::Comment::\n\ *************** *** 369,410 **** Include:\"^include[ \\t]\":::Keyword::}", ! "Sh Ksh Bash:1:0{\n\ ! escaped special characters:\"\\\\[\\\\\"\"$`']\":::Escaped Items::\n\ ! single quoted string:\"'\":\"'\"::Single Quoted String::\n\ ! double quoted string:\"\"\"\":\"\"\"\"::Double Quoted String::\n\ ! double quoted escape:\"\\\\[\\\\\"\"$`]\":::Escaped Items:double quoted string:\n\ ! dq command sub:\"`\":\"`\":\"\"\"\":Subroutine:double quoted string:\n\ ! dq arithmetic expansion:\"\\$\\(\\(\":\"\\)\\)\":\"\"\"\":Double Quoted String:double quoted string:\n\ ! dq new command sub:\"\\$\\(\":\"\\)\":\"\"\"\":Subroutine:double quoted string:\n\ ! dq variables:\"\\$([-*@#?$!0-9]|[a-zA-Z_][0-9a-zA-Z_]*)\":::Identifier:double quoted string:\n\ ! dq variables2:\"\\${\":\"}\":\"\\n\":Identifier:double quoted string:\n\ ! arithmetic expansion:\"\\$\\(\\(\":\"\\)\\)\"::Double Quoted String::\n\ ! ae escapes:\"\\\\[\\\\$`\"\"']\":::Escaped Items:arithmetic expansion:\n\ ! ae single quoted string:\"'\":\"'\":\"\\)\\)\":Single Quoted String:arithmetic expansion:\n\ ! ae command sub:\"`\":\"`\":\"\\)\\)\":Subroutine:arithmetic expansion:\n\ ! ae arithmetic expansion:\"\\$\\(\\(\":\"\\)\\)\"::Double Quoted String:arithmetic expansion:\n\ ! ae new command sub:\"\\$\\(\":\"\\)\":\"\\)\\)\":Subroutine:arithmetic expansion:\n\ ! ae variables:\"\\$([-*@#?$!0-9]|[a-zA-Z_][0-9a-zA-Z_]*)\":::Identifier:arithmetic expansion:\n\ ! ae variables2:\"\\${\":\"}\":\"\\)\\)\":Identifier:arithmetic expansion:\n\ ! comments:\"^[ \\t]*#\":\"$\"::Comment::\n\ ! command substitution:\"`\":\"`\"::Subroutine::\n\ ! cs escapes:\"\\\\[\\\\$`\"\"']\":::Escaped Items:command substitution:\n\ ! cs single quoted string:\"'\":\"'\":\"`\":Single Quoted String:command substitution:\n\ ! cs variables:\"\\$([-*@#?$!0-9]|[a-zA-Z_][0-9a-zA-Z_]*)\":::Identifier:command substitution:\n\ ! cs variables2:\"\\${\":\"}\":\"`\":Identifier:command substitution:\n\ ! new command substitution:\"\\$\\(\":\"\\)\"::Subroutine::\n\ ! ncs escapes:\"\\\\[\\\\$`\"\"']\":::Escaped Items:new command substitution:\n\ ! ncs single quoted string:\"'\":\"'\":\"\\)\":Single Quoted String:new command substitution:\n\ ! ncs variables:\"\\$([-*@#?$!0-9]|[a-zA-Z_][0-9a-zA-Z_]*)\":::Identifier:new command substitution:\n\ ! ncs variables2:\"\\${\":\"}\":\"\\)\":Identifier:new command substitution:\n\ ! assignment:\"[a-zA-Z_][0-9a-zA-Z_]*[ \\t]*=\":::Identifier1::\n\ ! variables:\"\\$([-*@#?$!0-9_]|[a-zA-Z_][0-9a-zA-Z_]*)\":::Identifier::\n\ ! variables2:\"\\${\":\"}\"::Identifier::\n\ ! comments in line:\"#\":\"$\"::Comment::\n\ ! numbers:\"<((0(x|X)[0-9a-fA-F]*)|[0-9.]+((e|E)(\\+|-)?)?[0-9]*)(L|l|UL|ul|u|U|F|f)?>\":::Numeric Const::D\n\ ! keywords:\"<(if|fi|then|else|elif|case|esac|while|for|do|done|in|select|until|function|continue|break|return|exit)>\":::Keyword::D\n\ ! test operators:\"<-eq|-ne|-gt|-lt|-ge|-le|-[aorwxfdhcbpugkstznL]>\":::Operators::D\n\ ! delimiters:\"[-{};.,<>&~=!|^%[\\]+*|]\":::Delimiters::D\n\ ! built ins:\"<(:|\\\\.|\\\\[\\\\[|]]|source|alias|bg|bind|builtin|cd|chdir|command|declare|dirs|echo|enable|eval|exec|export|fc|fg|getopts|hash|help|history|jobs|kill|let|local|logout|popd|print|pushd|pwd|read|readonly|set|shift|stop|suspend|test|times|trap|type|typeset|ulimit|umask|unalias|unset|wait|whence)>\":::Library Function::D\n\ ! }", ! "Csh:1:0 {\n\ Comment:\"#\":\"$\"::Comment::\n\ --- 377,417 ---- Include:\"^include[ \\t]\":::Keyword::}", ! "Sh Ksh Bash:1:0{\n\ ! escaped special characters:\"\\\\[\\\\\"\"$`']\":::Escaped Items::\n\ ! single quoted string:\"'\":\"'\"::Single Quoted String::\n\ ! double quoted string:\"\"\"\":\"\"\"\"::Double Quoted String::\n\ ! double quoted escape:\"\\\\[\\\\\"\"$`]\":::Escaped Items:double quoted string:\n\ ! dq command sub:\"`\":\"`\":\"\"\"\":Subroutine:double quoted string:\n\ ! dq arithmetic expansion:\"\\$\\(\\(\":\"\\)\\)\":\"\"\"\":Double Quoted String:double quoted string:\n\ ! dq new command sub:\"\\$\\(\":\"\\)\":\"\"\"\":Subroutine:double quoted string:\n\ ! dq variables:\"\\$([-*@#?$!0-9]|[a-zA-Z_][0-9a-zA-Z_]*)\":::Identifier:double quoted string:\n\ ! dq variables2:\"\\${\":\"}\":\"\\n\":Identifier:double quoted string:\n\ ! arithmetic expansion:\"\\$\\(\\(\":\"\\)\\)\"::Double Quoted String::\n\ ! ae escapes:\"\\\\[\\\\$`\"\"']\":::Escaped Items:arithmetic expansion:\n\ ! ae single quoted string:\"'\":\"'\":\"\\)\\)\":Single Quoted String:arithmetic expansion:\n\ ! ae command sub:\"`\":\"`\":\"\\)\\)\":Subroutine:arithmetic expansion:\n\ ! ae arithmetic expansion:\"\\$\\(\\(\":\"\\)\\)\"::Double Quoted String:arithmetic expansion:\n\ ! ae new command sub:\"\\$\\(\":\"\\)\":\"\\)\\)\":Subroutine:arithmetic expansion:\n\ ! ae variables:\"\\$([-*@#?$!0-9]|[a-zA-Z_][0-9a-zA-Z_]*)\":::Identifier:arithmetic expansion:\n\ ! ae variables2:\"\\${\":\"}\":\"\\)\\)\":Identifier:arithmetic expansion:\n\ ! comments:\"^[ \\t]*#\":\"$\"::Comment::\n\ ! command substitution:\"`\":\"`\"::Subroutine::\n\ ! cs escapes:\"\\\\[\\\\$`\"\"']\":::Escaped Items:command substitution:\n\ ! cs single quoted string:\"'\":\"'\":\"`\":Single Quoted String:command substitution:\n\ ! cs variables:\"\\$([-*@#?$!0-9]|[a-zA-Z_][0-9a-zA-Z_]*)\":::Identifier:command substitution:\n\ ! cs variables2:\"\\${\":\"}\":\"`\":Identifier:command substitution:\n\ ! new command substitution:\"\\$\\(\":\"\\)\"::Subroutine::\n\ ! ncs escapes:\"\\\\[\\\\$`\"\"']\":::Escaped Items:new command substitution:\n\ ! ncs single quoted string:\"'\":\"'\":\"\\)\":Single Quoted String:new command substitution:\n\ ! ncs variables:\"\\$([-*@#?$!0-9]|[a-zA-Z_][0-9a-zA-Z_]*)\":::Identifier:new command substitution:\n\ ! ncs variables2:\"\\${\":\"}\":\"\\)\":Identifier:new command substitution:\n\ ! assignment:\"[a-zA-Z_][0-9a-zA-Z_]*[ \\t]*=\":::Identifier1::\n\ ! variables:\"\\$([-*@#?$!0-9_]|[a-zA-Z_][0-9a-zA-Z_]*)\":::Identifier::\n\ ! variables2:\"\\${\":\"}\"::Identifier::\n\ ! comments in line:\"#\":\"$\"::Comment::\n\ ! numbers:\"<((0(x|X)[0-9a-fA-F]*)|[0-9.]+((e|E)(\\+|-)?)?[0-9]*)(L|l|UL|ul|u|U|F|f)?>\":::Numeric Const::D\n\ ! keywords:\"<(if|fi|then|else|elif|case|esac|while|for|do|done|in|select|until|function|continue|break|return|exit)>\":::Keyword::D\n\ ! command options:\"[ \\t]-[^ \\t{}[\\],.()'\"\"~!@#$%^&*|\\\\<>?]+\":::Operators::D\n\ ! delimiters:\"<[.]>|[{};<>&~=!|^%[\\]+*|]\":::Delimiters::D\n\ ! built ins:\"<(:|\\\\.|\\\\[\\\\[|]]|source|alias|bg|bind|builtin|cd|chdir|command|declare|dirs|echo|enable|eval|exec|export|fc|fg|getopts|hash|help|history|jobs|kill|let|local|logout|popd|print|pushd|pwd|read|readonly|set|shift|stop|suspend|test|times|trap|type|typeset|ulimit|umask|unalias|unset|wait|whence)>\":::Library Function::D}", ! "Csh:1:0{\n\ Comment:\"#\":\"$\"::Comment::\n\ *** preferences.c 1997/11/19 21:38:43 1.7 --- preferences.c 1997/11/29 06:16:23 1.8 *************** *** 445,447 **** Tcl:Default\n\ - Sh Ksh Bash:Default\n\ Csh:Default\n\ --- 445,446 ---- *************** *** 467,468 **** --- 466,468 ---- Tcl:Default\n\ + Sh Ksh Bash:Default\n\ Csh:Default\n\ *** textBuf.c 1997/11/03 06:51:15 1.5 --- textBuf.c 1997/11/29 06:10:33 1.6 *************** *** 264,266 **** /* Guard against array bounds reads. Note that pos == buf->length ! ** is also and array bounds read. */ --- 264,266 ---- /* Guard against array bounds reads. Note that pos == buf->length ! ** is also an array bounds read. */ *** textDisp.c 1997/11/03 06:51:15 1.4 --- textDisp.c 1997/11/29 06:23:54 1.5 *************** *** 36,37 **** --- 36,41 ---- + #ifdef PURIFY + # define _BufGetCharacter BufGetCharacter + #endif + #define TOP_MARGIN 1 *************** *** 292,294 **** ** a style table which translates style buffer codes (indexed by buffer ! ** character - UNFINISHED_STYLE) into fonts and colors; and a callback mechanism for ** as-needed highlighting, triggered by a style buffer entry of --- 296,298 ---- ** a style table which translates style buffer codes (indexed by buffer ! ** character - unfinishedStyle) into fonts and colors; and a callback mechanism for ** as-needed highlighting, triggered by a style buffer entry of *************** *** 1483,1485 **** if (style & STYLE_LOOKUP_MASK) { ! styleRec = &textD->styleTable[(style & STYLE_LOOKUP_MASK) - UNFINISHED_STYLE]; fs = styleRec->font; --- 1487,1489 ---- if (style & STYLE_LOOKUP_MASK) { ! styleRec = &textD->styleTable[(style & STYLE_LOOKUP_MASK) - textD->unfinishedStyle]; fs = styleRec->font; *************** *** 1672,1674 **** if (style & STYLE_LOOKUP_MASK) ! fs = textD->styleTable[(style & STYLE_LOOKUP_MASK) - UNFINISHED_STYLE].font; else --- 1676,1678 ---- if (style & STYLE_LOOKUP_MASK) ! fs = textD->styleTable[(style & STYLE_LOOKUP_MASK) - textD->unfinishedStyle].font; else *************** *** 2274,2278 **** style = (unsigned char)_BufGetCharacter(textD->styleBuffer, ! lineStartPos+i) - UNFINISHED_STYLE; ! /* printf("visLineNum: %2d lineStartPos: %4d i: %2d style: %d\n", visLineNum, lineStartPos, i, style); */ ! width += XTextWidth(textD->styleTable[style].font, expandedChar, len); --- 2278,2299 ---- style = (unsigned char)_BufGetCharacter(textD->styleBuffer, ! lineStartPos+i); ! #if 0 ! #ifdef PURIFY ! purify_printf_with_call_chain("visLineNum: %d lineStartPos: %d i: %d style: %d\n", ! visLineNum, lineStartPos, i, style); ! #endif ! #endif ! if (style == textD->unfinishedStyle) { ! /* encountered "unfinished" style, trigger parsing */ ! (textD->unfinishedHighlightCB)(textD, lineStartPos+i, textD->highlightCBArg); ! style = (unsigned char)_BufGetCharacter(textD->styleBuffer, ! lineStartPos+i); ! #if 1 ! #ifdef PURIFY ! purify_printf_with_call_chain("visLineNum: %d lineStartPos: %d i: %d style: %d\n", ! visLineNum, lineStartPos, i, style); ! #endif ! #endif ! } ! width += XTextWidth(textD->styleTable[style-textD->unfinishedStyle].font, expandedChar, len);