summaryrefslogtreecommitdiff
path: root/runtime/autoload
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-03-19 22:11:16 +0000
committerBram Moolenaar <Bram@vim.org>2006-03-19 22:11:16 +0000
commitc15ef30c08fa1f2c52053c6345ded69d6f2bc701 (patch)
tree9eba0cff591216ac2b5c2ea48de4a855f5628b28 /runtime/autoload
parente0fa560e6f77181969c16333f357c168eff16fd4 (diff)
downloadvim-c15ef30c08fa1f2c52053c6345ded69d6f2bc701.zip
updated for version 7.0229
Diffstat (limited to 'runtime/autoload')
-rw-r--r--runtime/autoload/syntaxcomplete.vim13
-rw-r--r--runtime/autoload/xmlcomplete.vim5
2 files changed, 13 insertions, 5 deletions
diff --git a/runtime/autoload/syntaxcomplete.vim b/runtime/autoload/syntaxcomplete.vim
index deaf7ed53..4a13d4f0a 100644
--- a/runtime/autoload/syntaxcomplete.vim
+++ b/runtime/autoload/syntaxcomplete.vim
@@ -1,12 +1,18 @@
" Vim completion script
" Language: All languages, uses existing syntax highlighting rules
" Maintainer: David Fishburn <fishburn@ianywhere.com>
-" Version: 1.1
-" Last Change: Wed Mar 01 2006 9:58:14 PM
+" Version: 1.2
+" Last Change: Sat Mar 18 2006 8:25:30 PM
" Set completion with CTRL-X CTRL-O to autoloaded function.
+" This check is in place in case this script is
+" sourced directly instead of using the autoload feature.
if exists('+omnifunc')
- setlocal omnifunc=syntaxcomplete#Complete
+ " Do not set the option if already set since this
+ " results in an E117 warning.
+ if &omnifunc == ""
+ setlocal omnifunc=syntaxcomplete#Complete
+ endif
endif
if exists('g:loaded_syntax_completion')
@@ -22,6 +28,7 @@ let s:syn_remove_words = 'match,matchgroup=,contains,'.
let s:cache_name = []
let s:cache_list = []
+let s:prepended = ''
" This function is used for the 'omnifunc' option.
function! syntaxcomplete#Complete(findstart, base)
diff --git a/runtime/autoload/xmlcomplete.vim b/runtime/autoload/xmlcomplete.vim
index 6b7b804e3..2551cae30 100644
--- a/runtime/autoload/xmlcomplete.vim
+++ b/runtime/autoload/xmlcomplete.vim
@@ -1,7 +1,7 @@
" Vim completion script
" Language: XML
" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change: 2006 Feb 18
+" Last Change: 2006 Mar 19
" This function will create Dictionary with users namespace strings and values
" canonical (system) names of data files. Names should be lowercase,
@@ -81,8 +81,9 @@ function! xmlcomplete#CompleteTags(findstart, base)
let context_lines = getline(curline-i, curline)
let b:compl_context = join(context_lines, ' ')
break
- elseif context_line =~ '>[^<]*$'
+ elseif context_line =~ '>[^<]*$' || i == curline
" Normal tag line, no need for completion at all
+ " OR reached first line without tag at all
let b:compl_context = ''
break
endif