Ignore:
Timestamp:
Mar 19, 2014, 11:11:30 AM (11 years ago)
Author:
dmik
Message:

python: Update vendor to 2.7.6.

Location:
python/vendor/current/Misc/Vim
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • python/vendor/current/Misc/Vim/python.vim

    r2 r388  
    1 " Auto-generated Vim syntax file for Python (trunk: r60376M).
     1" Auto-generated Vim syntax file for Python (trunk: r80490).
    22"
    33" To use: copy or symlink to ~/.vim/syntax/python.vim
    … …  
    6464if exists("python_highlight_builtins")
    6565  syn keyword pythonBuiltin    Ellipsis False None NotImplemented True __debug__
    66   syn keyword pythonBuiltin    __import__ abs all any apply basestring bool
    67   syn keyword pythonBuiltin    buffer bytes callable chr classmethod cmp coerce
    68   syn keyword pythonBuiltin    compile complex copyright credits delattr dict
    69   syn keyword pythonBuiltin    dir divmod enumerate eval execfile exit file
    70   syn keyword pythonBuiltin    filter float frozenset getattr globals hasattr
    71   syn keyword pythonBuiltin    hash help hex id input int intern isinstance
    72   syn keyword pythonBuiltin    issubclass iter len license list locals long map
    73   syn keyword pythonBuiltin    max min object oct open ord pow property quit
    74   syn keyword pythonBuiltin    range raw_input reduce reload repr reversed round
    75   syn keyword pythonBuiltin    set setattr slice sorted staticmethod str sum
    76   syn keyword pythonBuiltin    super trunc tuple type unichr unicode vars xrange
    77   syn keyword pythonBuiltin    zip
     66  syn keyword pythonBuiltin    __import__ abs all any apply basestring bin bool
     67  syn keyword pythonBuiltin    buffer bytearray bytes callable chr classmethod
     68  syn keyword pythonBuiltin    cmp coerce compile complex copyright credits
     69  syn keyword pythonBuiltin    delattr dict dir divmod enumerate eval execfile
     70  syn keyword pythonBuiltin    exit file filter float format frozenset getattr
     71  syn keyword pythonBuiltin    globals hasattr hash help hex id input int intern
     72  syn keyword pythonBuiltin    isinstance issubclass iter len license list
     73  syn keyword pythonBuiltin    locals long map max memoryview min next object
     74  syn keyword pythonBuiltin    oct open ord pow print property quit range
     75  syn keyword pythonBuiltin    raw_input reduce reload repr reversed round set
     76  syn keyword pythonBuiltin    setattr slice sorted staticmethod str sum super
     77  syn keyword pythonBuiltin    tuple type unichr unicode vars xrange zip
    7878
    7979endif
    … …  
    8282if exists("python_highlight_exceptions")
    8383  syn keyword pythonException    ArithmeticError AssertionError AttributeError
    84   syn keyword pythonException    BaseException DeprecationWarning EOFError
    85   syn keyword pythonException    EnvironmentError Exception FloatingPointError
    86   syn keyword pythonException    FutureWarning GeneratorExit IOError ImportError
    87   syn keyword pythonException    ImportWarning IndentationError IndexError
    88   syn keyword pythonException    KeyError KeyboardInterrupt LookupError
    89   syn keyword pythonException    MemoryError NameError NotImplementedError
    90   syn keyword pythonException    OSError OverflowError PendingDeprecationWarning
     84  syn keyword pythonException    BaseException BufferError BytesWarning
     85  syn keyword pythonException    DeprecationWarning EOFError EnvironmentError
     86  syn keyword pythonException    Exception FloatingPointError FutureWarning
     87  syn keyword pythonException    GeneratorExit IOError ImportError ImportWarning
     88  syn keyword pythonException    IndentationError IndexError KeyError
     89  syn keyword pythonException    KeyboardInterrupt LookupError MemoryError
     90  syn keyword pythonException    NameError NotImplementedError OSError
     91  syn keyword pythonException    OverflowError PendingDeprecationWarning
    9192  syn keyword pythonException    ReferenceError RuntimeError RuntimeWarning
    9293  syn keyword pythonException    StandardError StopIteration SyntaxError

  • python/vendor/current/Misc/Vim/vimrc

    r2 r388  
    1616" Some suggested options are listed but commented out at the end of this file.
    1717
     18" Number of spaces that a pre-existing tab is equal to.
     19" For the amount of space used for a new tab use shiftwidth.
     20au BufRead,BufNewFile *py,*pyw,*.c,*.h set tabstop=8
    1821
    19 " Number of spaces to use for an indent.
     22" What to use for an indent.
    2023" This will affect Ctrl-T and 'autoindent'.
    2124" Python: 4 spaces
    22 " C: 8 spaces (pre-existing files) or 4 spaces (new files)
     25" C: tabs (pre-existing files) or 4 spaces (new files)
    2326au BufRead,BufNewFile *.py,*pyw set shiftwidth=4
    24 au BufRead *.c,*.h set shiftwidth=8
    25 au BufNewFile *.c,*.h set shiftwidth=4
    26 
    27 " Number of spaces that a pre-existing tab is equal to.
    28 " For the amount of space used for a new tab use shiftwidth.
    29 " Python: 8
    30 " C: 8
    31 au BufRead,BufNewFile *py,*pyw,*.c,*.h set tabstop=8
    32 
    33 " Replace tabs with the equivalent number of spaces.
    34 " Also have an autocmd for Makefiles since they require hard tabs.
    35 " Python: yes
    36 " C: no
    37 " Makefile: no
    3827au BufRead,BufNewFile *.py,*.pyw set expandtab
    39 au BufRead,BufNewFile *.c,*.h set noexpandtab
     28fu Select_c_style()
     29    if search('^\t', 'n', 150)
     30        set shiftwidth=8
     31        set noexpandtab
     32    el
     33        set shiftwidth=4
     34        set expandtab
     35    en
     36endf
     37au BufRead,BufNewFile *.c,*.h call Select_c_style()
    4038au BufRead,BufNewFile Makefile* set noexpandtab
    4139
    42 " Use the below highlight group when displaying bad whitespace is desired
     40" Use the below highlight group when displaying bad whitespace is desired.
    4341highlight BadWhitespace ctermbg=red guibg=red
    4442
Note: See TracChangeset for help on using the changeset viewer.