Add new option 'python_highlight_file_headers_as_comments'

The option is disabled by default and when enabled highlight shebang and
coding file headers as comments instead of special characters.

CHANGES.txt

@@ -1,3 +1,19 @@
+Revision 3.3.5 (2013-08-31):
+
+    - Highlight 'import', 'from' and 'as' as include statements.
+      Patch by pydave at GitHub.
+    - Added new option 'python_highlight_file_headers_as_comments' (disabled by
+      default) to highlight shebang and coding file headers as comments.
+      Proposed by pydave at GitHub.
+
+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.

README.rst

@@ -117,6 +117,8 @@ Options used by the script
   Highlight doc-tests
 ``python_print_as_function``
   Highlight ``print`` statement as function for Python 2
+``python_highlight_file_headers_as_comments``
+  Highlight shebang and coding headers as comments
 ``python_highlight_all``
   Enable all the options above. *NOTE: This option don't override any
   previously set options*
@@ -126,11 +128,15 @@ Options used by the script
 Contributors
 ------------
 
-- Jeroen Ruigrok van der Werven
-- Pedro Algarvio
-- John Eikenberry
-- Caleb Adamantine
+List of the contributors in alphabetical order:
+
 - Andrea Riciputi
 - Anton Butanaev
+- Caleb Adamantine
+- Jeroen Ruigrok van der Werven
+- John Eikenberry
 - Marc Weber
+- Pedro Algarvio
+- pydave at GitHub
 - 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-06-01
+" Last Change:  2013-08-31
 " Filenames:    *.py
-" Version:      3.3.2
+" Version:      3.3.5
 "
 " Based on python.vim (from Vim 6.1 distribution)
 " by Neil Schemenauer <nas at python dot ca>
@@ -20,14 +20,18 @@
 " Contributors
 " ============
 "
-"   Jeroen Ruigrok van der Werven
-"   Pedro Algarvio
-"   John Eikenberry
-"   Caleb Adamantine
+" List of the contributors in alphabetical order:
+"
 "   Andrea Riciputi
 "   Anton Butanaev
+"   Caleb Adamantine
+"   Jeroen Ruigrok van der Werven
+"   John Eikenberry
 "   Marc Weber
+"   Pedro Algarvio
+"   pydave at GitHub
 "   Will Gray
+"   Yuri Habrusiev
 "
 " Options
 " =======
@@ -69,6 +73,9 @@
 "    python_highlight_doctests              Highlight doc-tests
 "    python_print_as_function               Highlight 'print' statement as
 "                                           function for Python 2
+"    python_highlight_file_headers_as_comments
+"                                           Highlight shebang and coding
+"                                           headers as comments
 "
 "    python_highlight_all                   Enable all the options above
 "                                           NOTE: This option don't override
@@ -88,8 +95,8 @@ endif
 "
 " Commands
 "
-command! -buffer Python2Syntax let b:python_version_2 = 1 | if exists("g:syntax_on") | syn off | endif | syn enable
-command! -buffer Python3Syntax let b:python_version_2 = 0 | 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 | let &syntax=&syntax
 
 " Enable option if it's not defined
 function! s:EnableByDefault(name)
@@ -146,7 +153,7 @@ syn keyword pythonStatement     with
 syn keyword pythonStatement     def class nextgroup=pythonFunction skipwhite
 syn keyword pythonRepeat        for while
 syn keyword pythonConditional   if elif else
-syn keyword pythonPreCondit     import from
+syn keyword pythonImport        import from
 syn keyword pythonException     try except finally
 syn keyword pythonOperator      and in is not or
 
@@ -154,10 +161,11 @@ if s:Python2Syntax()
   if !s:Enabled("g:python_print_as_function")
     syn keyword pythonStatement  print
   endif
-  syn keyword pythonPreCondit   as
+  syn keyword pythonImport      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
 
@@ -174,8 +182,10 @@ syn match   pythonDot        "\." display containedin=pythonDottedName
 "
 
 syn match   pythonComment	"#.*$" display contains=pythonTodo,@Spell
+if !s:Enabled("g:python_highlight_file_headers_as_comments")
   syn match   pythonRun		"\%^#!.*$"
   syn match   pythonCoding	"\%^.*\%(\n.*\)\?#.*coding[:=]\s*[0-9A-Za-z-_.]\+.*$"
+endif
 syn keyword pythonTodo		TODO FIXME XXX contained
 
 "
@@ -368,7 +378,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__
@@ -464,7 +475,7 @@ if version >= 508 || !exists("did_python_syn_inits")
   endif
 
   HiLink pythonStatement        Statement
-  HiLink pythonPreCondit        Statement
+  HiLink pythonImport           Include
   HiLink pythonFunction         Function
   HiLink pythonConditional      Conditional
   HiLink pythonRepeat           Repeat
@@ -476,8 +487,10 @@ if version >= 508 || !exists("did_python_syn_inits")
   HiLink pythonDot              Normal
 
   HiLink pythonComment          Comment
+  if !s:Enabled("g:python_highlight_file_headers_as_comments")
     HiLink pythonCoding           Special
     HiLink pythonRun              Special
+  endif
   HiLink pythonTodo             Todo
 
   HiLink pythonError            Error
@@ -521,6 +534,8 @@ if version >= 508 || !exists("did_python_syn_inits")
   HiLink pythonHexError         Error
   HiLink pythonBinError         Error
 
+  HiLink pythonBoolean          Boolean
+
   HiLink pythonBuiltinObj       Structure
   HiLink pythonBuiltinFunc      Function