diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-03-26 21:06:50 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-03-26 21:06:50 +0000 |
| commit | 899dddf88804af20d560b5277f1ca1bc4dd8e2b3 (patch) | |
| tree | 17525001ae02c1e762f4dd6b383612bd16f7238d /runtime/indent | |
| parent | 5c6a2d53232f248c0ba0e4278a447042aa00371e (diff) | |
updated for version 7.0b02v7.0b02
Diffstat (limited to 'runtime/indent')
| -rw-r--r-- | runtime/indent/config.vim | 8 | ||||
| -rw-r--r-- | runtime/indent/python.vim | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/runtime/indent/config.vim b/runtime/indent/config.vim index cb2023d7dc..c6c54b25f7 100644 --- a/runtime/indent/config.vim +++ b/runtime/indent/config.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Autoconf configure.{ac,in} file " Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se> -" Latest Revision: 2005-06-30 +" Latest Revision: 2006-02-11 " TODO: how about nested [()]'s in one line " what's wrong with '\\\@!'? @@ -63,7 +63,7 @@ function GetConfigIndent() " if previous line had an unmatched closing parantheses, " indent to the matching opening parantheses - if line =~ '[^(]*\\\@<!)$' + if line =~ '[^(]\+\\\@<!)$' call search(')', 'bW') let lnum = searchpair('\\\@<!(', '', ')', 'bWn') let ind = indent(lnum) @@ -71,7 +71,7 @@ function GetConfigIndent() " if previous line had an unmatched closing bracket, " indent to the matching opening bracket - if line =~ '[^[]*]$' + if line =~ '[^[]\+]$' call search(']', 'bW') let lnum = searchpair('\[', '', ']', 'bWn') let ind = indent(lnum) @@ -79,5 +79,3 @@ function GetConfigIndent() return ind endfunction - -" vim: set sts=2 sw=2: diff --git a/runtime/indent/python.vim b/runtime/indent/python.vim index 38ef1d259e..3b560a8a7e 100644 --- a/runtime/indent/python.vim +++ b/runtime/indent/python.vim @@ -2,7 +2,7 @@ " Language: Python " Maintainer: Bram Moolenaar <Bram@vim.org> " Original Author: David Bustos <bustos@caltech.edu> -" Last Change: 2005 Feb 24 +" Last Change: 2006 Mar 26 " Only load this indent file when no other was loaded. if exists("b:did_indent") @@ -117,10 +117,7 @@ function GetPythonIndent(lnum) let min = col + 1 endif endwhile - echomsg min let pline = strpart(pline, 0, min - 1) - echomsg pline - sleep 1 endif else let col = 0 @@ -153,10 +150,8 @@ function GetPythonIndent(lnum) if getline(a:lnum) =~ '^\s*\(except\|finally\)\>' let lnum = a:lnum - 1 while lnum >= 1 - echomsg 'got here' if getline(lnum) =~ '^\s*\(try\|except\)\>' let ind = indent(lnum) - echomsg 'got here, indent is ' . ind if ind >= indent(a:lnum) return -1 " indent is already less than this endif @@ -164,7 +159,6 @@ function GetPythonIndent(lnum) endif let lnum = lnum - 1 endwhile - echomsg 'got to the end' return -1 " no matching "try"! endif |