gtksourceview r1960 - in trunk: . gtksourceview/language-specs

[muntyan svn gnome org]

Author: muntyan
Date: Wed Jun 18 16:22:10 2008
New Revision: 1960
URL: http://svn.gnome.org/viewvc/gtksourceview?rev=1960&view=rev

Log:
2008-06-18  Yevgen Muntyan  <muntyan tamu edu>

	* gtksourceview/language-specs/ruby.lang (predefined-variables):
        do not use \b after non-word characters, fixes bug #538967.
	* gtksourceview/language-specs/objc.lang: highlight self and
        super; highlight nil and Nil as YES and NO.



Modified:
   trunk/ChangeLog
   trunk/gtksourceview/language-specs/objc.lang
   trunk/gtksourceview/language-specs/ruby.lang

Modified: trunk/gtksourceview/language-specs/objc.lang
==============================================================================
--- trunk/gtksourceview/language-specs/objc.lang	(original)
+++ trunk/gtksourceview/language-specs/objc.lang	Wed Jun 18 16:22:10 2008
@@ -79,8 +79,8 @@
     <context id="objc-source">
       <include>
         <context id="objc-keywords" style-ref="keyword">
-          <keyword>nil</keyword>
-          <keyword>Nil</keyword>
+          <keyword>self</keyword>
+          <keyword>super</keyword>
         </context>
 
         <context id="objc-types" style-ref="type">
@@ -99,6 +99,8 @@
 
         <context id="objc-common-defines" style-ref="common-defines">
           <keyword>METHOD_NULL</keyword>
+          <keyword>nil</keyword>
+          <keyword>Nil</keyword>
           <keyword>NO</keyword>
           <keyword>YES</keyword>
         </context>

Modified: trunk/gtksourceview/language-specs/ruby.lang
==============================================================================
--- trunk/gtksourceview/language-specs/ruby.lang	(original)
+++ trunk/gtksourceview/language-specs/ruby.lang	Wed Jun 18 16:22:10 2008
@@ -173,9 +173,9 @@
       <match extended="true">
         \$([!$&amp;"'*+,./0:;&lt;=&gt;? \`~1-9]|
            -[0FIKadilpvw]|
-           deferr|defout|stderr|stdin|stdout|
-           DEBUG|FILENAME|KCODE|LOADED_FEATURES|LOAD_PATH|
-           PROGRAM_NAME|SAFE|VERBOSE)\b
+           (deferr|defout|stderr|stdin|stdout|
+            DEBUG|FILENAME|KCODE|LOADED_FEATURES|LOAD_PATH|
+            PROGRAM_NAME|SAFE|VERBOSE)\b)
       </match>
     </context>
 
@@ -266,7 +266,7 @@
     </context>
 
     <!-- ruby strings do not end at line end,
-         so we cannot use def:string 
+         so we cannot use def:string
          (parts lifted from perl.lang) -->
     <context id="double-quoted-string" style-ref="string">
       <start>"</start>