From 98fdb775f85c0c7ca95dff9308512c38cc1921e7 Mon Sep 17 00:00:00 2001
From: Don Ho <don.h@free.fr>
Date: Wed, 11 Nov 2009 16:59:13 +0000
Subject: [PATCH] [NEW_MINOR_FEATURE] Add the ability to add the second keyword
 group for user in both LISP and Scheme languages.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@557 f5eea248-9336-0410-98b8-ebc06183d4e3
---
 PowerEditor/bin/plugins/APIs/cpp.xml                  | 2 +-
 PowerEditor/src/ScitillaComponent/ScintillaEditView.h | 4 ++--
 PowerEditor/src/langs.model.xml                       | 2 ++
 PowerEditor/src/stylers.model.xml                     | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/PowerEditor/bin/plugins/APIs/cpp.xml b/PowerEditor/bin/plugins/APIs/cpp.xml
index 895520c9f..4b50a0e1d 100644
--- a/PowerEditor/bin/plugins/APIs/cpp.xml
+++ b/PowerEditor/bin/plugins/APIs/cpp.xml
@@ -14,7 +14,7 @@
 		add your characters in "additionalWordChar" attribute (without separator)
 		in order to make calltip hint work
 		-->
-		<Environment ignoreCase="no" startFunc="(" stopFunc=")" paramSeparator="," terminal=";" additionalWordChar="."/>
+		<Environment ignoreCase="no" startFunc="(" stopFunc=")" paramSeparator="," terminal=";" additionalWordChar=""/>
 		<!--
 		The following items should be alphabetically ordered.
 		func="yes" means the keyword should be treated as a fuction, and thus can be used in the parameter
diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
index 7a456f499..3acf799a0 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
+++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
@@ -727,11 +727,11 @@ protected:
 	};
 
 	void setLispLexer(){
-		setLexer(SCLEX_LISP, L_LISP, LIST_0);
+		setLexer(SCLEX_LISP, L_LISP, LIST_0 | LIST_1);
 	};
 
 	void setSchemeLexer(){
-		setLexer(SCLEX_LISP, L_SCHEME, LIST_0);
+		setLexer(SCLEX_LISP, L_SCHEME, LIST_0 | LIST_1);
 	};
 
 	void setAsmLexer(){
diff --git a/PowerEditor/src/langs.model.xml b/PowerEditor/src/langs.model.xml
index a12a77475..63c4df1ea 100644
--- a/PowerEditor/src/langs.model.xml
+++ b/PowerEditor/src/langs.model.xml
@@ -117,6 +117,7 @@
         </Language>
         <Language name="lisp" ext="lsp lisp" commentLine=";">
             <Keywords name="instre1">not defun + - * / = &lt; &gt; &lt;= &gt;= princ eval apply funcall quote identity function complement backquote lambda set setq setf defun defmacro gensym make symbol intern symbol name symbol value symbol plist get getf putprop remprop hash make array aref car cdr caar cadr cdar cddr caaar caadr cadar caddr cdaar cdadr cddar cdddr caaaar caaadr caadar caaddr cadaar cadadr caddar cadddr cdaaar cdaadr cdadar cdaddr cddaar cddadr cdddar cddddr cons list append reverse last nth nthcdr member assoc subst sublis nsubst  nsublis remove length list length mapc mapcar mapl maplist mapcan mapcon rplaca rplacd nconc delete atom symbolp numberp boundp null listp consp minusp zerop plusp evenp oddp eq eql equal cond case and or let l if prog prog1 prog2 progn go return do dolist dotimes catch throw error cerror break continue errset baktrace evalhook truncate float rem min max abs sin cos tan expt exp sqrt random logand logior logxor lognot bignums logeqv lognand lognor logorc2 logtest logbitp logcount integer length nil</Keywords>
+            <Keywords name="instre2"></Keywords>
         </Language>
         <Language name="lua" ext="lua" commentLine="--">
             <Keywords name="instre1">and break do else elseif end false for function if in local nil not or repeat return then true until while</Keywords>
@@ -181,6 +182,7 @@
         </Language>
         <Language name="scheme" ext="scm smd ss" commentLine=";">
             <Keywords name="instre1">+ - * / = &lt; &gt; &lt;= &gt;= =&gt; abs acos and angle append apply asin assoc assoc assq assv atan begin boolean? caar cadr call-with-current-continuation call/cc call-with-input-file call-with-output-file call-with-values car cdr caar cadr cdar cddr caaar caadr cadar caddr cdaar cdadr cddar cdddr caaaar caaadr caadar caaddr cadaar cadadr caddar cadddr cdaaar cdaadr cdadar cdaddr cddaar cddadr cdddar cddddr case ceiling char-&gt;integer char-alphabetic? char-ci&lt;=? char-ci&lt;? char-ci=? char-ci&gt;=? char-ci&gt;? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char&lt;=? char&lt;? char=? char&gt;=? char&gt;? char? close-input-port close-output-port complex? cond cons cos current-input-port current-output-port define define-syntax delay denominator display do dynamic-wind else eof-object? eq? equal? eqv? eval even? exact-&gt;inexact exact? exp expt floor for-each force gcd if imag-part inexact-&gt;exact inexact? input-port? integer-&gt;char integer? interaction-environment lambda lcm length let let* let-syntax letrec letrec-syntax list list-&gt;string list-&gt;vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector map max member memq memv min modulo negative? newline not null-environment null? number-&gt;string number? numerator odd? open-input-file open-output-file or output-port? pair? peek-char input-port? output-port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string-&gt;list string-&gt;number string-&gt;symbol string-append string-ci&lt;=? string-ci&lt;? string-ci=? string-ci&gt;=? string-ci&gt;? string-copy string-fill! string-length string-ref string-set! string&lt;=? string&lt;? string=? string&gt;=? string&gt;? string? substring symbol-&gt;string symbol? syntax-rules transcript-off transcript-on truncate unquote unquote-splicing values vector vector-&gt;list vector-fill! vector-length vector-ref vector-set! vector? with-input-from-file with-output-to-file write write-char zero?</Keywords>
+            <Keywords name="instre2"></Keywords>
         </Language>
         <Language name="smalltalk" ext="st" commentStart="&quot;" commentEnd="&quot;">
             <Keywords name="instre1">ifTrue: ifFalse: whileTrue: whileFalse: ifNil: ifNotNil: whileTrue whileFalse repeat isNil notNil</Keywords>
diff --git a/PowerEditor/src/stylers.model.xml b/PowerEditor/src/stylers.model.xml
index b75b80f76..704e300b7 100644
--- a/PowerEditor/src/stylers.model.xml
+++ b/PowerEditor/src/stylers.model.xml
@@ -388,6 +388,7 @@
             <WordsStyle name="COMMENTLINE" styleID="1" fgColor="008000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
             <WordsStyle name="NUMBER" styleID="2" fgColor="FF8000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
             <WordsStyle name="FUNCTION WORD" styleID="3" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="1" fontSize="" keywordClass="instre1" />
+            <WordsStyle name="FUNCTION WORD2" styleID="4" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="1" fontSize="" keywordClass="instre2" />
             <WordsStyle name="SYMBOL" styleID="5" fgColor="000080" bgColor="FFFFFF" fontName="" fontStyle="1" fontSize="" />
             <WordsStyle name="STRING" styleID="6" fgColor="808080" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
             <WordsStyle name="IDENTIFIER" styleID="9" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
@@ -633,6 +634,7 @@
             <WordsStyle name="COMMENTLINE" styleID="1" fgColor="008000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
             <WordsStyle name="NUMBER" styleID="2" fgColor="FF8000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
             <WordsStyle name="FUNCTION WORD" styleID="3" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="1" fontSize="" keywordClass="instre1" />
+            <WordsStyle name="FUNCTION WORD2" styleID="4" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="1" fontSize="" keywordClass="instre2" />
             <WordsStyle name="SYMBOL" styleID="5" fgColor="000080" bgColor="FFFFFF" fontName="" fontStyle="1" fontSize="" />
             <WordsStyle name="STRING" styleID="6" fgColor="808080" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
             <WordsStyle name="IDENTIFIER" styleID="9" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />