Browse Source

Added options python_highlight_builtin_objs and python_highlight_builtin_funcs

Dmitry Vasiliev 9 years ago
parent
commit
32c7868195
2 changed files with 28 additions and 7 deletions
  1. 5
    0
      CHANGES.txt
  2. 23
    7
      python.vim

+ 5
- 0
CHANGES.txt View File

@@ -20,6 +20,11 @@ Revision 3.0.0 (2008-12-07):
20 20
       "execfile", "file", "help", "intern", "long", "raw_input", "reduce",
21 21
       "reload", "unichr", "unicode", "xrange";
22 22
 
23
+Revision 2.6.6 (2010-04-09):
24
+
25
+    - Applied patch by Andrea Riciputi with new configuration options
26
+      "python_highlight_builtin_objs" and "python_highligh_builtin_funcs"
27
+
23 28
 Revision 2.6.5 (2009-07-24):
24 29
 
25 30
     - Applied patch by Caleb Adamantine which fixes highlighting for decorators

+ 23
- 7
python.vim View File

@@ -2,9 +2,9 @@
2 2
 " Language:	Python
3 3
 " Maintainer:	Dmitry Vasiliev <dima@hlabs.spb.ru>
4 4
 " URL:		http://www.hlabs.spb.ru/vim/python.vim
5
-" Last Change:	2009-07-24
5
+" Last Change:	2010-04-09
6 6
 " Filenames:	*.py
7
-" Version:	2.6.5
7
+" Version:	2.6.6
8 8
 "
9 9
 " Based on python.vim (from Vim 6.1 distribution)
10 10
 " by Neil Schemenauer <nas@python.ca>
@@ -20,6 +20,8 @@
20 20
 "        for the patch fixing small typo
21 21
 "    Caleb Adamantine
22 22
 "        for the patch fixing highlighting for decorators
23
+"    Andrea Riciputi
24
+"        for the patch with new configuration options
23 25
 
24 26
 "
25 27
 " Options:
@@ -29,9 +31,15 @@
29 31
 "
30 32
 " Option names:
31 33
 "
32
-"    For highlight builtin functions:
34
+"    For highlight builtin functions and objects:
33 35
 "       python_highlight_builtins
34 36
 "
37
+"    For highlight builtin objects:
38
+"       python_highlight_builtin_objs
39
+"
40
+"    For highlight builtin funtions:
41
+"       python_highlight_builtin_funcs
42
+"
35 43
 "    For highlight standard exceptions:
36 44
 "       python_highlight_exceptions
37 45
 "
@@ -74,7 +82,12 @@ endif
74 82
 if exists("python_highlight_all") && python_highlight_all != 0
75 83
   " Not override previously set options
76 84
   if !exists("python_highlight_builtins")
77
-    let python_highlight_builtins = 1
85
+    if !exists("python_highlight_builtin_objs")
86
+      let python_highlight_builtin_objs = 1
87
+    endif
88
+    if !exists("python_highlight_builtin_funcs")
89
+      let python_highlight_builtin_funcs = 1
90
+    endif
78 91
   endif
79 92
   if !exists("python_highlight_exceptions")
80 93
     let python_highlight_exceptions = 1
@@ -230,17 +243,20 @@ syn match   pythonFloat		"\<\d\+\.\d*\([eE][+-]\=\d\+\)\=[jJ]\=" display
230 243
 syn match   pythonOctError	"\<0[oO]\=\o*[8-9]\d*[lL]\=\>" display
231 244
 syn match   pythonBinError	"\<0[bB][01]*[2-9]\d*[lL]\=\>" display
232 245
 
233
-if exists("python_highlight_builtins") && python_highlight_builtins != 0
234
-  " Builtin functions, types and objects
246
+if exists("python_highlight_builtin_objs") && python_highlight_builtin_objs != 0
247
+  " Builtin objects and types
235 248
   syn keyword pythonBuiltinObj	True False Ellipsis None NotImplemented
236 249
   syn keyword pythonBuiltinObj	__debug__ __doc__ __file__ __name__ __package__
250
+endif
237 251
 
252
+if exists("python_highlight_builtin_funcs") && python_highlight_builtin_funcs != 0
253
+  " Builtin functions
238 254
   syn keyword pythonBuiltinFunc	__import__ abs all any apply
239 255
   syn keyword pythonBuiltinFunc	basestring bin bool buffer bytearray bytes callable
240 256
   syn keyword pythonBuiltinFunc	chr classmethod cmp coerce compile complex
241 257
   syn keyword pythonBuiltinFunc	delattr dict dir divmod enumerate eval
242 258
   syn keyword pythonBuiltinFunc	execfile file filter float format frozenset getattr
243
-  syn keyword pythonBuiltinFunc	globals hasattr hash help hex id 
259
+  syn keyword pythonBuiltinFunc	globals hasattr hash help hex id
244 260
   syn keyword pythonBuiltinFunc	input int intern isinstance
245 261
   syn keyword pythonBuiltinFunc	issubclass iter len list locals long map max
246 262
   syn keyword pythonBuiltinFunc	min next object oct open ord