From ed2f0b349fd5d56cb27f54868ef75b60e01f476a Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Sat, 21 Feb 2015 10:34:15 +0000 Subject: [PATCH] Wrapping some overlong lines, and fixing a typo in the Java file. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5122 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 2 ++ doc/syntax/java.nanorc | 3 ++- doc/syntax/lua.nanorc | 8 +++++--- doc/syntax/python.nanorc | 3 ++- doc/syntax/ruby.nanorc | 5 +++-- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b2d29ce..b3c293e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2015-02-21 Benno Schulenberg * README: Fix the explanation of how to subscribe to a mailing list. + * doc/syntax/{java,lua,python,ruby}.nanorc: Wrap some overlong lines + and fix a typo ("stictfp") in the Java file. 2015-02-18 Mike Frysinger * doc/syntax/sh.nanorc: Recognize also dash, openrc and runscript. diff --git a/doc/syntax/java.nanorc b/doc/syntax/java.nanorc index 0beebf47..829c8afa 100644 --- a/doc/syntax/java.nanorc +++ b/doc/syntax/java.nanorc @@ -5,7 +5,8 @@ magic "Java " color green "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>" color red "\<(break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\>" -color cyan "\<(abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\>" +color cyan "\<(abstract|class|extends|final|implements|import|instanceof|interface|native)\>" +color cyan "\<(package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\>" color red ""[^"]*"" color yellow "\<(true|false|null)\>" color blue "//.*" diff --git a/doc/syntax/lua.nanorc b/doc/syntax/lua.nanorc index 7512f53c..3dbbea8d 100644 --- a/doc/syntax/lua.nanorc +++ b/doc/syntax/lua.nanorc @@ -15,18 +15,20 @@ color brightyellow ":|\*|/|%|\+|-|\^|>|>=|<|<=|~=|=|\.\.|\<(not|and|or)\>" color brightblue "\<(do|end|while|repeat|until|if|elseif|then|else|for|in|function|local|return|break)\>" # Keywords -color brightyellow "\<(debug|string|math|table|io|coroutine|os)\>\." +color brightyellow "\<(io|math|os|string|table|coroutine|debug)\>\." color brightyellow "\<(_G|_VERSION|assert|collectgarbage|dofile|error|getfenv|getmetatable|ipairs|load|loadfile|module|next|pairs|pcall|print|rawequal|rawget|rawset|require|select|setfenv|setmetatable|tonumber|tostring|type|unpack|xpcall)\s*\(" # Standard library color brightyellow "io\.\<(close|flush|input|lines|open|output|popen|read|tmpfile|type|write|stdin|stdout|stderr)\>" -color brightyellow "math\.\<(abs|acos|asin|atan2|atan|ceil|cosh|cos|deg|exp|floor|fmod|frexp|huge|ldexp|log10|log|max|min|mod|modf|pi|pow|rad|random|randomseed|sinh|tan)\>" +color brightyellow "math\.\<(abs|acos|asin|atan2|atan|ceil|cosh|cos|deg|exp|floor|fmod|frexp|huge|ldexp|log10|log)\>" +color brightyellow "math\.\<(max|min|mod|modf|pi|pow|rad|random|randomseed|sinh|tan)\>" color brightyellow "os\.\<(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)\>" color brightyellow "package\.\<(cpath|loaded|loadlib|path|preload|seeall)\>" color brightyellow "string\.\<(byte|char|dump|find|format|gmatch|gsub|len|lower|match|rep|reverse|sub|upper)\>" color brightyellow "table\.\<(concat|insert|maxn|remove|sort)\>" color brightyellow "coroutine\.\<(create|resume|running|status|wrap|yield)\>" -color brightyellow "debug\.\<(debug|getfenv|gethook|getinfo|getlocal|getmetatable|getregistry|getupvalue|setfenv|sethook|setlocal|setmetatable|setupvalue|traceback)\>" +color brightyellow "debug\.\<(debug|getfenv|gethook|getinfo|getlocal|getmetatable|getregistry|getupvalue)\>" +color brightyellow "debug\.\<(setfenv|sethook|setlocal|setmetatable|setupvalue|traceback)\>" # File handle methods color brightyellow "\:\<(close|flush|lines|read|seek|setvbuf|write)\>" diff --git a/doc/syntax/python.nanorc b/doc/syntax/python.nanorc index f2ee15a2..de876bdb 100644 --- a/doc/syntax/python.nanorc +++ b/doc/syntax/python.nanorc @@ -6,7 +6,8 @@ header "^#!.*python[-0-9._]*" # Function definitions. icolor brightblue "def [0-9A-Z_]+" # Keywords. -color brightcyan "\<(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield)\>" +color brightcyan "\<(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from)\>" +color brightcyan "\<(global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield)\>" # Strings. color brightgreen "['][^']*[^\\][']" "[']{3}.*[^\\][']{3}" diff --git a/doc/syntax/ruby.nanorc b/doc/syntax/ruby.nanorc index a4ed1783..298425f0 100644 --- a/doc/syntax/ruby.nanorc +++ b/doc/syntax/ruby.nanorc @@ -3,8 +3,9 @@ syntax "ruby" "\.rb$" header "^#!.*ruby[-0-9._]*" -# Asciibetical list of reserved words. -color yellow "\<(BEGIN|END|alias|and|begin|break|case|class|def|defined\?|do|else|elsif|end|ensure|false|for|if|in|module|next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\>" +# Reserved words. +color yellow "\<(BEGIN|END|alias|and|begin|break|case|class|def|defined\?|do|else|elsif|end|ensure|false|for|if|in|module)\>" +color yellow "\<(next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\>" # Constants. color brightblue "(\$|@|@@)?\<[A-Z]+[0-9A-Z_a-z]*" # Ruby "symbols". -- 2.39.5