Fix highlight_builtins when highlight_all isn't set

Fixes #66
Closes #67

Author: snejus

README.md

@@ -59,7 +59,7 @@ let g:python_highlight_all = 1
 | --------------------------------------------- | -------------------------------------------------------------- | ------- |
 | `g:python_version_2`                          | Python 2 mode                                                  | `0`     |
 | `b:python_version_2`                          | Python 2 mode (buffer local)                                   | `0`     |
-| `g:python_highlight_builtins`                 | Highlight builtin functions and objects                        | `0`     |
+| `g:python_highlight_builtins`                 | Highlight builtin objects, types, and functions                | `0`     |
 | `g:python_highlight_builtin_objs`             | Highlight builtin objects only                                 | `0`     |
 | `g:python_highlight_builtin_types`            | Highlight builtin types only                                   | `0`     |
 | `g:python_highlight_builtin_funcs`            | Highlight builtin functions only                               | `0`     |

doc/python-syntax.txt

@@ -57,7 +57,7 @@ following command to your `~/.config/nvim/init.vim` or `~/.vimrc`: >
     Python 2 mode (buffer local)
 
 `g:python_highlight_builtins` (default `0`)
-    Highlight builtin functions and objects
+    Highlight builtin functions, types, and objects
 
 `g:python_highlight_builtin_objs` (default `0`)
     Highlight builtin objects only

syntax/python.vim

@@ -41,11 +41,6 @@ call s:EnableByDefault('g:python_highlight_builtin_funcs_kwarg')
 
 if s:Enabled('g:python_highlight_all')
     call s:EnableByDefault('g:python_highlight_builtins')
-    if s:Enabled('g:python_highlight_builtins')
-        call s:EnableByDefault('g:python_highlight_builtin_objs')
-        call s:EnableByDefault('g:python_highlight_builtin_funcs')
-        call s:EnableByDefault('g:python_highlight_builtin_types')
-    endif
     call s:EnableByDefault('g:python_highlight_exceptions')
     call s:EnableByDefault('g:python_highlight_string_formatting')
     call s:EnableByDefault('g:python_highlight_string_format')
@@ -59,6 +54,12 @@ if s:Enabled('g:python_highlight_all')
     call s:EnableByDefault('g:python_highlight_operators')
 endif
 
+if s:Enabled('g:python_highlight_builtins')
+    call s:EnableByDefault('g:python_highlight_builtin_objs')
+    call s:EnableByDefault('g:python_highlight_builtin_funcs')
+    call s:EnableByDefault('g:python_highlight_builtin_types')
+endif
+
 "
 " Function calls
 "