diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-12-28 14:08:13 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-12-28 14:08:13 (GMT) |
| commit | 9a37159e51fc436594752ab0e6c6ad4d25df8e4e (patch) | |
| tree | ba47bacea35d0244e2fb7fdbfe91e6e03d0386d3 /Misc/Vim | |
| parent | f609a345a4adaedd5806b4ec8439b84c409b9f66 (diff) | |
| download | cpython-9a37159e51fc436594752ab0e6c6ad4d25df8e4e.zip cpython-9a37159e51fc436594752ab0e6c6ad4d25df8e4e.tar.gz cpython-9a37159e51fc436594752ab0e6c6ad4d25df8e4e.tar.bz2 | |
Merged revisions 59595-59604 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59596 | brett.cannon | 2007-12-24 20:58:25 +0100 (Mon, 24 Dec 2007) | 4 lines
Fix the docstrings of time.localtime() and gmtime() for the tm_mday field.
Will backport.
........
r59598 | brett.cannon | 2007-12-25 00:43:30 +0100 (Tue, 25 Dec 2007) | 3 lines
Make trailing whitespace explicit (including when it is an all-whitespace
line).
........
r59599 | brett.cannon | 2007-12-25 01:14:34 +0100 (Tue, 25 Dec 2007) | 7 lines
Actually execute the tests for the getter/setter/deleter tests on properties.
Also fix the test by having the test classes inherit from object.
Are the getter/setter/deleter attributes supposed to be able to chain? As of
right now they can't as the property tries to call what the property returns,
which is another property when they are chained.
........
r59600 | brett.cannon | 2007-12-25 07:44:59 +0100 (Tue, 25 Dec 2007) | 2 lines
Remove a straggling debugging print line.
........
r59604 | kurt.kaiser | 2007-12-28 05:18:01 +0100 (Fri, 28 Dec 2007) | 2 lines
Configure Dialog: improved layout for keybinding. Patch 1457 Tal Einat.
........
Diffstat (limited to 'Misc/Vim')
| -rw-r--r-- | Misc/Vim/vimrc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Misc/Vim/vimrc b/Misc/Vim/vimrc index 11ec638..2013bf3 100644 --- a/Misc/Vim/vimrc +++ b/Misc/Vim/vimrc @@ -41,10 +41,12 @@ au BufRead,BufNewFile Makefile* set noexpandtab " Use the below highlight group when displaying bad whitespace is desired highlight BadWhitespace ctermbg=red guibg=red -" Display tabs at the beginning of a line in Python mode as bad +" Display tabs at the beginning of a line in Python mode as bad. " Should be done for C code, but not until all code has been moved to 4-space " indents. au BufRead,BufNewFile *.py,*.pyw match BadWhitespace /^\t\+/ +" Make trailing whitespace be flagged as bad. +au BufRead,BufNewFile *.py,*.pyw,*.c,*.h match BadWhitespace /\s\+$/ " Wrap text after a certain number of characters " Python: 79 @@ -86,12 +88,3 @@ au BufNewFile *.py,*.pyw,*.c,*.h set fileformat=unix " Keep indentation level from previous line: ``set autoindent`` " Folding based on indentation: ``set foldmethod=indent`` - -" Make trailing whitespace explicit (left off since this will automatically -" insert the highlight or characters *as you type*, which can get annoying): -"``match BadWhitespace /\s\+$/`` -" -" or, for a non-colored, character-based solution: -" -"``set list listchars=trail:-`` - |