Browse Source

Reorganized keywords

Dmitry Vasiliev 15 years ago
parent
commit
69dcbc3482
2 changed files with 6 additions and 3 deletions
  1. 2
    0
      CHANGES.txt
  2. 4
    3
      python3.0.vim

+ 2
- 0
CHANGES.txt View File

4
     - Updated support for str.format;
4
     - Updated support for str.format;
5
     - Added new builtins introduced in Python 2.6: "ascii", "exec",
5
     - Added new builtins introduced in Python 2.6: "ascii", "exec",
6
       "memoryview", "print";
6
       "memoryview", "print";
7
+    - Added new keyword "nonlocal";
8
+    - Removed exception "StandardError";
7
     - Removed builtins: "apply", "basestring", "buffer", "callable", "coerce",
9
     - Removed builtins: "apply", "basestring", "buffer", "callable", "coerce",
8
       "execfile", "file", "help", "intern", "long", "raw_input", "reduce",
10
       "execfile", "file", "help", "intern", "long", "raw_input", "reduce",
9
       "reload", "unichr", "unicode", "xrange";
11
       "reload", "unichr", "unicode", "xrange";

+ 4
- 3
python3.0.vim View File

96
 
96
 
97
 " Keywords
97
 " Keywords
98
 syn keyword pythonStatement	break continue del
98
 syn keyword pythonStatement	break continue del
99
-syn keyword pythonStatement	exec return
99
+syn keyword pythonStatement	exec return as
100
 syn keyword pythonStatement	pass raise
100
 syn keyword pythonStatement	pass raise
101
 syn keyword pythonStatement	global assert
101
 syn keyword pythonStatement	global assert
102
 syn keyword pythonStatement	lambda yield
102
 syn keyword pythonStatement	lambda yield
103
 syn keyword pythonStatement	with nonlocal
103
 syn keyword pythonStatement	with nonlocal
104
+syn keyword pythonStatement	False None True
104
 syn keyword pythonStatement	def class nextgroup=pythonFunction skipwhite
105
 syn keyword pythonStatement	def class nextgroup=pythonFunction skipwhite
105
 syn match   pythonFunction	"[a-zA-Z_][a-zA-Z0-9_]*" display contained
106
 syn match   pythonFunction	"[a-zA-Z_][a-zA-Z0-9_]*" display contained
106
 syn keyword pythonRepeat	for while
107
 syn keyword pythonRepeat	for while
107
 syn keyword pythonConditional	if elif else
108
 syn keyword pythonConditional	if elif else
108
-syn keyword pythonImport	import from as
109
+syn keyword pythonImport	import from
109
 syn keyword pythonException	try except finally
110
 syn keyword pythonException	try except finally
110
 syn keyword pythonOperator	and in is not or
111
 syn keyword pythonOperator	and in is not or
111
 
112
 
221
 
222
 
222
 if exists("python_highlight_builtins") && python_highlight_builtins != 0
223
 if exists("python_highlight_builtins") && python_highlight_builtins != 0
223
   " Builtin functions, types and objects
224
   " Builtin functions, types and objects
224
-  syn keyword pythonBuiltinObj	True False Ellipsis None NotImplemented
225
+  syn keyword pythonBuiltinObj	Ellipsis NotImplemented
225
   syn keyword pythonBuiltinObj	__debug__ __doc__ __file__ __name__ __package__
226
   syn keyword pythonBuiltinObj	__debug__ __doc__ __file__ __name__ __package__
226
 
227
 
227
   syn keyword pythonBuiltinFunc	__import__ abs all any ascii
228
   syn keyword pythonBuiltinFunc	__import__ abs all any ascii