Clean up boolean highlighting

Turning syntax off and back on is more than what's necessary to reload the syntax for the current buffer.

CHANGES.txt

@@ -1,3 +1,20 @@
+Revision 3.3.4 (2013-08-11):
+
+    - Highlight True and False as booleans. Patch by Yuri Habrusiev.
+
+Revision 3.3.3 (2013-06-02):
+
+   - More lightweight syntax reloading. Patch by Will Gray.
+
+Revision 3.3.2 (2013-06-01):
+
+   - Fixed behaviour of b:python_version_2 variable. Reported by Will Gray.
+
+Revision 3.3.1 (2013-05-12):
+
+   - The script was moved to its own repository at
+     https://github.com/hdima/python-syntax
+
 Revision 3.3.0 (2013-03-10):
 
     - Merge Python 2 and Python 3 script versions into the single python.vim

README.rst

@@ -126,10 +126,14 @@ Options used by the script
 Contributors
 ------------
 
-- Jeroen Ruigrok van der Werven
+List of the contributors in alphabetical order:
-- Pedro Algarvio
+
-- John Eikenberry
-- Caleb Adamantine
 - Andrea Riciputi
 - Anton Butanaev
+- Caleb Adamantine
+- Jeroen Ruigrok van der Werven
+- John Eikenberry
 - Marc Weber
+- Pedro Algarvio
+- Will Gray
+- Yuri Habrusiev

syntax/python.vim

@@ -2,9 +2,9 @@
 " Language:     Python
 " Maintainer:   Dmitry Vasiliev <dima at hlabs dot org>
 " URL:          https://github.com/hdima/python-syntax
-" Last Change:  2013-05-12
+" Last Change:  2013-08-11
 " Filenames:    *.py
-" Version:      3.3.1
+" Version:      3.3.4
 "
 " Based on python.vim (from Vim 6.1 distribution)
 " by Neil Schemenauer <nas at python dot ca>
@@ -20,13 +20,17 @@
 " Contributors
 " ============
 "
-"   Jeroen Ruigrok van der Werven
+" List of the contributors in alphabetical order:
-"   Pedro Algarvio
+"
-"   John Eikenberry
-"   Caleb Adamantine
 "   Andrea Riciputi
 "   Anton Butanaev
+"   Caleb Adamantine
+"   Jeroen Ruigrok van der Werven
+"   John Eikenberry
 "   Marc Weber
+"   Pedro Algarvio
+"   Will Gray
+"   Yuri Habrusiev
 "
 " Options
 " =======
@@ -87,8 +91,8 @@ endif
 "
 " Commands
 "
-command! -buffer Python2Syntax let b:python_version_2 = 1 | if exists("g:syntax_on") | syn off | endif | syn enable
+command! -buffer Python2Syntax let b:python_version_2 = 1 | let &syntax=&syntax
-command! -buffer Python3Syntax let b:python_version_2 = 0 | if exists("g:syntax_on") | syn off | endif | syn enable
+command! -buffer Python3Syntax let b:python_version_2 = 0 | let &syntax=&syntax
 
 " Enable option if it's not defined
 function! s:EnableByDefault(name)
@@ -99,12 +103,15 @@ endfunction
 
 " Check if option is enabled
 function! s:Enabled(name)
-  return exists(a:name) && {a:name} != 0
+  return exists(a:name) && {a:name}
 endfunction
 
 " Is it Python 2 syntax?
 function! s:Python2Syntax()
-  return s:Enabled("b:python_version_2") || s:Enabled("g:python_version_2")
+  if exists("b:python_version_2")
+      return b:python_version_2
+  endif
+  return s:Enabled("g:python_version_2")
 endfunction
 
 "
@@ -153,7 +160,8 @@ if s:Python2Syntax()
   syn keyword pythonPreCondit   as
   syn match   pythonFunction    "[a-zA-Z_][a-zA-Z0-9_]*" display contained
 else
-  syn keyword pythonStatement   as nonlocal False None True
+  syn keyword pythonStatement   as nonlocal None
+  syn keyword pythonBoolean     True False
   syn match   pythonFunction    "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
 endif
 
@@ -364,7 +372,8 @@ syn match   pythonFloat		"\<\d\+\.\d*\%([eE][+-]\=\d\+\)\=[jJ]\=" display
 
 if s:Enabled("g:python_highlight_builtin_objs")
   if s:Python2Syntax()
-    syn keyword pythonBuiltinObj	True False None
+    syn keyword pythonBuiltinObj	None
+    syn keyword pythonBoolean		True False
   endif
   syn keyword pythonBuiltinObj	Ellipsis NotImplemented
   syn keyword pythonBuiltinObj	__debug__ __doc__ __file__ __name__ __package__
@@ -517,6 +526,8 @@ if version >= 508 || !exists("did_python_syn_inits")
   HiLink pythonHexError         Error
   HiLink pythonBinError         Error
 
+  HiLink pythonBoolean          Boolean
+
   HiLink pythonBuiltinObj       Structure
   HiLink pythonBuiltinFunc      Function