← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vim/maverick

« back to all changes in this revision

Viewing changes to runtime/syntax/python.vim

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2009-05-04 11:13:42 UTC
  • mfrom: (1.1.8 upstream) (0.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090504111342-60miqybsixdpc345
Tags: 2:7.2.148-2ubuntu1
* Merge from Debian unstable, remaining changes:
  - debian/runtime/vimrc: "syntax on" is a sane default for non-tiny vim.
  - runtime/syntax/debcontrol.vim:
    + Add "metapackages" to the list of valid sections.
  - runtime/syntax/grub.vim:
    + Add Ubuntu-specific 'quiet' keyword.
  - Drop vim-lesstif package and lesstif2-dev build-dependency.
  - Enable Python interpreter on basic builds.
  - Disable autoindent, line-wrapping, and backup files by default.
* Dropped changes, merged in Debian:
  - Add jaunty, karmic to the list of valid suites.
  - runtime/syntax/debsources.vim:
    + Add "jaunty" to debsourcesDistrKeyword
  - Create a .pot file for translations.
* Drop gutsy from the list of valid distro series, it's been EOLed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
runtime/syntax/python.vim
1
1
" Vim syntax file
2
2
" Language:     Python
3
3
" Maintainer:   Neil Schemenauer <nas@python.ca>
4
 
" Updated:      2006-10-15
 
4
" Updated:      2009-02-24
5
5
"               Added Python 2.4 features 2006 May 4 (Dmitry Vasiliev)
6
6
"
7
7
" Options to control Python syntax highlighting:
44
44
syn keyword pythonStatement     global assert
45
45
syn keyword pythonStatement     lambda yield
46
46
syn keyword pythonStatement     def class nextgroup=pythonFunction skipwhite
47
 
syn match   pythonFunction      "[a-zA-Z_][a-zA-Z0-9_]*" contained
 
47
syn match   pythonFunction      "[[:alpha:]_][[:alnum:]_]*" contained
48
48
syn keyword pythonRepeat        for while
49
49
syn keyword pythonConditional   if elif else
50
50
syn keyword pythonOperator      and in is not or
54
54
syn keyword pythonTodo          TODO FIXME XXX contained
55
55
 
56
56
" Decorators (new in Python 2.4)
57
 
syn match   pythonDecoratorName "[[:alpha:]_][[:alnum:]_]*\%(\.[[:alpha:]_][[:alnum:]_]*\)*" contained
 
57
syn match   pythonDecoratorName "[[:alpha:]_][[:alnum:]_]*\%(\.[[:alpha:]_][[:alnum:]_]*\)*" contained
58
58
syn match   pythonDecorator     "@" display nextgroup=pythonDecoratorName skipwhite
59
59
 
60
60
" strings