Version 2.9

- Changed default behavior to support XML omni completion.
- Changed default value of g:acp_behaviorKeywordCommand option.
  The option with "\<C-p>" cause a problem which inserts a match without
  <CR> when 'dictionary' has been set and keyword completion is done.
- Changed to show error message when incompatible with a installed vim.

Author: Takeshi NISHIDA

doc/acp.jax

@@ -56,6 +56,7 @@ ZIPファイルをランタイムディレクトリに展開します。
                                     + 0文字以上のファイル名文字
         オムニ補完      ruby        ".", "::" or 単語を構成する文字以外 + ":"
         オムニ補完      python      "."
+        オムニ補完      xml         "<", "</" or ("<" + ">"以外の文字列 + " ")
         オムニ補完      html/xhtml  "<", "</" or ("<" + ">"以外の文字列 + " ")
         オムニ補完      css         (":", ";", "{", "^", "@", or "!")
                                     + 0個または1個のスペース
@@ -130,7 +131,7 @@ ZIPファイルをランタイムディレクトリに展開します。
         ーン。
 
                                              *g:acp_behaviorKeywordCommand*  >
-  let g:acp_behaviorKeywordCommand = "\<C-p>"
+  let g:acp_behaviorKeywordCommand = "\<C-n>"
 <
         キーワード補完のコマンド。このオプションには普通 "\<C-n>" か "\<C-p>"
         を設定します。
@@ -165,6 +166,12 @@ ZIPファイルをランタイムディレクトリに展開します。
         Python オムニ補完の自動ポップアップを行うのに必要なカーソルの直前のキ
         ーワード文字数。負数ならこの補完は行いません。
 
+                                              *g:acp_behaviorXmlOmniLength*  >
+  let g:acp_behaviorXmlOmniLength = 0
+<
+        XML オムニ補完の自動ポップアップを行うのに必要なカーソルの直前のキーワ
+        ード文字数。負数ならこの補完は行いません。
+
                                              *g:acp_behaviorHtmlOmniLength*  >
   let g:acp_behaviorHtmlOmniLength = 0
 <

doc/acp.txt

@@ -58,6 +58,7 @@ default behavior is as follows:
         Omni      ruby        ".", "::" or non-word character + ":"
                               (|+ruby| required.)
         Omni      python      "." (|+python| required.)
+        Omni      xml         "<", "</" or ("<" + non-">" characters + " ")
         Omni      html/xhtml  "<", "</" or ("<" + non-">" characters + " ")
         Omni      css         (":", ";", "{", "^", "@", or "!")
                               + 0 or 1 space
@@ -134,7 +135,7 @@ OPTIONS                                                          *acp-options*
         completion.
 
                                              *g:acp_behaviorKeywordCommand*  >
-  let g:acp_behaviorKeywordCommand = "\<C-p>"
+  let g:acp_behaviorKeywordCommand = "\<C-n>"
 <
         Command for keyword completion. This option is usually set "\<C-n>" or
         "\<C-p>".
@@ -174,6 +175,13 @@ OPTIONS                                                          *acp-options*
         attempt python omni-completion. If negative value, this completion
         will be never attempted.
 
+                                              *g:acp_behaviorXmlOmniLength*  >
+  let g:acp_behaviorXmlOmniLength = 0
+<
+        Length of keyword characters before a cursor, which are needed to
+        attempt XML omni-completion. If negative value, this completion will
+        be never attempted.
+
                                              *g:acp_behaviorHtmlOmniLength*  >
   let g:acp_behaviorHtmlOmniLength = 0
 <
@@ -229,6 +237,13 @@ SPECIAL THANKS                                                    *acp-thanks*
 ==============================================================================
 CHANGELOG                                                      *acp-changelog*
 
+2.9
+  - Changed default behavior to support XML omni completion.
+  - Changed default value of g:acp_behaviorKeywordCommand option.
+    The option with "\<C-p>" cause a problem which inserts a match without
+    <CR> when 'dictionary' has been set and keyword completion is done.
+  - Changed to show error message when incompatible with a installed vim.
+
 2.8.1
   - Fixed a bug which inserted a selected match to the next line when
     auto-wrapping (enabled with 'formatoptions') was performed.

plugin/acp.vim

@@ -5,7 +5,10 @@
 "=============================================================================
 " LOAD GUARD {{{1
 
-if exists('g:loaded_acp') || v:version < 702
+if exists('g:loaded_acp')
+  finish
+elseif v:version < 702
+  echoerr 'AutoComplPop does not support this version of vim (' . v:version . ').'
   finish
 endif
 let g:loaded_acp = 1
@@ -27,6 +30,7 @@ function s:makeDefaultBehavior()
         \   '*'      : [],
         \   'ruby'   : [],
         \   'python' : [],
+        \   'xml'    : [],
         \   'html'   : [],
         \   'xhtml'  : [],
         \   'css'    : [],
@@ -92,6 +96,15 @@ function s:makeDefaultBehavior()
           \ })
   endif
   "---------------------------------------------------------------------------
+  if g:acp_behaviorXmlOmniLength >= 0
+    call add(behavs.xml, {
+          \   'command' : "\<C-x>\<C-o>",
+          \   'pattern' : printf('\(<\|<\/\|<[^>]\+ \|<[^>]\+=\"\)\k\{%d,}$',
+          \                      g:acp_behaviorXmlOmniLength),
+          \   'repeat'  : 0,
+          \ })
+  endif
+  "---------------------------------------------------------------------------
   if g:acp_behaviorHtmlOmniLength >= 0
     let behavHtml = {
           \   'command' : "\<C-x>\<C-o>",
@@ -136,12 +149,13 @@ call s:defineOption('g:acp_completeOption', '.,w,b,k')
 call s:defineOption('g:acp_completeoptPreview', 0)
 call s:defineOption('g:acp_behaviorUserDefinedFunction', '')
 call s:defineOption('g:acp_behaviorUserDefinedPattern' , '\k$')
-call s:defineOption('g:acp_behaviorKeywordCommand', "\<C-p>")
+call s:defineOption('g:acp_behaviorKeywordCommand', "\<C-n>")
 call s:defineOption('g:acp_behaviorKeywordLength', 2)
 call s:defineOption('g:acp_behaviorFileLength', 0)
 call s:defineOption('g:acp_behaviorRubyOmniMethodLength', 0)
 call s:defineOption('g:acp_behaviorRubyOmniSymbolLength', 1)
 call s:defineOption('g:acp_behaviorPythonOmniLength', 0)
+call s:defineOption('g:acp_behaviorXmlOmniLength', 0)
 call s:defineOption('g:acp_behaviorHtmlOmniLength', 0)
 call s:defineOption('g:acp_behaviorCssOmniPropertyLength', 1)
 call s:defineOption('g:acp_behaviorCssOmniValueLength', 0)