r1206 - in /trunk/packages/vim-scripts: debian/changelog debian/patches/disabledby-xml.dpatch debian/vim-registry/vim-scripts.yaml debian/vim-scripts.status ftplugin/xml.vim html/ftplugin_xml.vim.html html/index.html

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Wed Feb 13 19:47:20 UTC 2008


Author: jamessan
Date: Wed Feb 13 19:47:20 2008
New Revision: 1206

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1206
Log:
* Updated addons:
  - xmledit

Modified:
    trunk/packages/vim-scripts/debian/changelog
    trunk/packages/vim-scripts/debian/patches/disabledby-xml.dpatch
    trunk/packages/vim-scripts/debian/vim-registry/vim-scripts.yaml
    trunk/packages/vim-scripts/debian/vim-scripts.status
    trunk/packages/vim-scripts/ftplugin/xml.vim
    trunk/packages/vim-scripts/html/ftplugin_xml.vim.html
    trunk/packages/vim-scripts/html/index.html

Modified: trunk/packages/vim-scripts/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=1206&op=diff
==============================================================================
--- trunk/packages/vim-scripts/debian/changelog (original)
+++ trunk/packages/vim-scripts/debian/changelog Wed Feb 13 19:47:20 2008
@@ -6,6 +6,8 @@
     - Do not let loaded_xml_ftplugin since that will prevent the ftplugin from
       being run in other buffers.  Thanks to Marvin Renich for the patch fix.
       (Closes: #465330)
+  * Updated addons:
+    - xmledit
 
  -- James Vega <jamessan at debian.org>  Tue, 05 Feb 2008 17:06:54 -0500
 

Modified: trunk/packages/vim-scripts/debian/patches/disabledby-xml.dpatch
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/patches/disabledby-xml.dpatch?rev=1206&op=diff
==============================================================================
--- trunk/packages/vim-scripts/debian/patches/disabledby-xml.dpatch (original)
+++ trunk/packages/vim-scripts/debian/patches/disabledby-xml.dpatch Wed Feb 13 19:47:20 2008
@@ -8,7 +8,7 @@
 diff -urNad vim-scripts~/ftplugin/xml.vim vim-scripts/ftplugin/xml.vim
 --- vim-scripts~/ftplugin/xml.vim	2007-01-17 16:05:03.000000000 +0100
 +++ vim-scripts/ftplugin/xml.vim	2007-01-27 09:48:34.000000000 +0100
-@@ -40,7 +40,7 @@
+@@ -44,7 +44,7 @@
  "==============================================================================
  
  " Only do this when not done yet for this buffer

Modified: trunk/packages/vim-scripts/debian/vim-registry/vim-scripts.yaml
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/vim-registry/vim-scripts.yaml?rev=1206&op=diff
==============================================================================
--- trunk/packages/vim-scripts/debian/vim-registry/vim-scripts.yaml (original)
+++ trunk/packages/vim-scripts/debian/vim-registry/vim-scripts.yaml Wed Feb 13 19:47:20 2008
@@ -122,8 +122,8 @@
   - plugin/EnhancedCommentify.vim
   - doc/EnhancedCommentify.txt
 ---
-addon: xml
-description: "editing helps for XML, HTML, and SGML documents"
+addon: xmledit
+description: "plugin to help edit XML, HTML, and SGML documents"
 basedir: /usr/share/vim-scripts/
 disabledby: "let loaded_xml_ftplugin = 1"
 files:

Modified: trunk/packages/vim-scripts/debian/vim-scripts.status
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/vim-scripts.status?rev=1206&op=diff
==============================================================================
--- trunk/packages/vim-scripts/debian/vim-scripts.status (original)
+++ trunk/packages/vim-scripts/debian/vim-scripts.status Wed Feb 13 19:47:20 2008
@@ -177,15 +177,15 @@
 version:     2.2
 
 script_name: ftplugin/xml.vim
-addon:       xml
-description: editing helps for XML, HTML, and SGML documents
+addon:       xmledit
+description: plugin to help edit XML, HTML, and SGML documents
 script_url:  http://www.vim.org/scripts/script.php?script_id=301
 author:      Devin Weaver
 author_url:  http://www.vim.org/account/profile.php?user_id=667
 email:       devin at tritarget.com
 license:     no license
 disabledby:  let loaded_xml_ftplugin = 1
-version:     1.29
+version:     65
 
 script_name: ftplugin/po.vim
 addon:       po

Modified: trunk/packages/vim-scripts/ftplugin/xml.vim
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/ftplugin/xml.vim?rev=1206&op=diff
==============================================================================
--- trunk/packages/vim-scripts/ftplugin/xml.vim (original)
+++ trunk/packages/vim-scripts/ftplugin/xml.vim Wed Feb 13 19:47:20 2008
@@ -2,8 +2,8 @@
 " FileType:     XML
 " Author:       Devin Weaver <vim (at) tritarget.com> 
 " Maintainer:   Devin Weaver <vim (at) tritarget.com>
-" Last Change:  $Date: 2005/05/14 22:13:22 $
-" Version:      $Revision: 1.29 $
+" Last Change:  $Date: 2008-02-08 23:41:48 -0500 (Fri, 08 Feb 2008) $
+" Version:      $Revision: 65 $
 " Location:     http://www.vim.org/scripts/script.php?script_id=301
 " Licence:      This program is free software; you can redistribute it
 "               and/or modify it under the terms of the GNU General Public
@@ -15,6 +15,10 @@
 "               Luc Hermitte <hermitte (at) free.fr> for testing the self
 "                 install documentation code and providing good bug fixes.
 "               Guo-Peng Wen for the self install documentation code.
+"               Shawn Boles <ickybots (at) gmail.com> for fixing the
+"                 <Leader>x cancelation bug. 
+"               Martijn van der Kwast <mvdkwast at gmx.net> for patching
+"                 problems with multi-languages (XML and PHP).
 
 " This script provides some convenience when editing XML (and some SGML)
 " formated documents.
@@ -44,6 +48,9 @@
   finish
 endif
 let b:did_ftplugin = 1
+" sboles, init these variables so vim doesn't complain on wrap cancel
+let b:last_wrap_tag_used = ""
+let b:last_wrap_atts_used = ""
 
 " WrapTag -> Places an XML tag around a visual selection.            {{{1
 " Brad Phelan: Wrap the argument in an XML tag
@@ -175,11 +182,7 @@
 
     if <SID>IsParsableTag (ltag)
         " find the break between tag name and atributes (or closing of tag)
-        " Too bad I can't just grab the position index of a pattern in a string.
-        let index = 1
-        while index < strlen (ltag) && strpart (ltag, index, 1) =~ '[[:alnum:]_:\-]'
-            let index = index + 1
-        endwhile
+	let index = matchend (ltag, '[[:alnum:]_:\-]\+')
 
         let tag_name = strpart (ltag, 1, index - 1)
         if strpart (ltag, index) =~ '[^/>[:blank:]]'
@@ -466,6 +469,30 @@
 endfunction
 endif
  
+" InsertGt -> close tags only if the cursor is in a HTML or XML context {{{1
+" Else continue editing
+if !exists("*s:InsertGt")
+function s:InsertGt( )
+  " When the current char is text within a tag it will not proccess as a
+  " syntax'ed element and return nothing below. Since the multi line wrap
+  " feture relies on using the '>' char as text within a tag we must use the
+  " char prior to establish if it is valid html/xml
+  if (getline('.')[col('.') - 1] == '>')
+    let char_syn=synIDattr(synID(line("."), col(".") - 1, 1), "name")
+  endif
+  if 0 == match(char_syn, 'html') || 0 == match(char_syn, 'xml')
+    call <SID>ParseTag()
+  else
+    if col(".") == col("$") - 1
+      startinsert!
+    else 
+      execute "normal! l"
+      startinsert
+    endif
+  endif
+endfunction
+endif
+
 " Section: Doc installation {{{1
 " Function: s:XmlInstallDocumentation(full_name, revision)              {{{2
 "   Install help documentation.
@@ -590,7 +617,7 @@
 " }}}2
 
 let s:revision=
-      \ substitute("$Revision: 1.29 $",'\$\S*: \([.0-9]\+\) \$','\1','')
+      \ substitute("$Revision: 65 $",'\$\S*: \([.0-9]\+\) \$','\1','')
 silent! let s:install_status =
     \ s:XmlInstallDocumentation(expand('<sfile>:p'), s:revision)
 if (s:install_status == 1)
@@ -602,6 +629,7 @@
 " Mappings and Settings.                                             {{{1
 " This makes the '%' jump between the start and end of a single tag.
 setlocal matchpairs+=<:>
+setlocal commentstring=<!--%s-->
 
 " Have this as an escape incase you want a literal '>' not to run the
 " ParseTag function.
@@ -622,7 +650,8 @@
 
 " Parse the tag after pressing the close '>'.
 if !exists("g:xml_tag_completion_map")
-    inoremap <buffer> > ><Esc>:call <SID>ParseTag()<Cr>
+    " inoremap <buffer> > ><Esc>:call <SID>ParseTag()<Cr>
+    inoremap <buffer> > ><Esc>:call <SID>InsertGt()<Cr>
 else
     execute "inoremap <buffer> " . g:xml_tag_completion_map . " ><Esc>:call <SID>ParseTag()<Cr>"
 endif

Modified: trunk/packages/vim-scripts/html/ftplugin_xml.vim.html
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/ftplugin_xml.vim.html?rev=1206&op=diff
==============================================================================
--- trunk/packages/vim-scripts/html/ftplugin_xml.vim.html (original)
+++ trunk/packages/vim-scripts/html/ftplugin_xml.vim.html Wed Feb 13 19:47:20 2008
@@ -153,8 +153,8 @@
 <tr>
   <td class="lightbg"><b>&nbsp;script karma&nbsp;</b></td>
   <td>
-    Rating <b>867/325</b>,
-    Downloaded by 16254  </td>
+    Rating <b>883/329</b>,
+    Downloaded by 16946  </td>
 </tr>
 </table>
 <p>
@@ -167,7 +167,7 @@
 <tr><td>ftplugin</td></tr>
 <tr><td>&nbsp;</td></tr>
 <tr><td class="prompt">description</td></tr>
-<tr><td>This script provides some convenience when editing XML (and some SGML including
<br>HTML) formated documents. It allows you to jump to the beginning or end of the
<br>tag block your cursor is in. '%' will jump between '&lt;' and '&gt;' within the tag
<br>your cursor is in. When in insert mode and you finish a tag (pressing '&gt;') the
<br>tag will be completed. If you press '&gt;' twice it will complete the tag and
<br>place the cursor in the middle of the tags on it's own line.
<br>
<br>For the latest development snapshot visit
<br>&nbsp;&nbsp;&nbsp;&nbsp;<a target="_blank" href="http://tritarget.com/cgi-bin/viewcvs.cgi/xmledit/ftplugin/xml.vim">http://tritarget.com/cgi-bin/viewcvs.cgi/xmledit/ftplugin/xml.vim</A></td></tr>
+<tr><td>This script provides some convenience when editing XML (and some SGML including
<br>HTML) formated documents. It allows you to jump to the beginning or end of the
<br>tag block your cursor is in. '%' will jump between '&lt;' and '&gt;' within the tag
<br>your cursor is in. When in insert mode and you finish a tag (pressing '&gt;') the
<br>tag will be completed. If you press '&gt;' twice it will complete the tag and
<br>place the cursor in the middle of the tags on it's own line.
<br>
<br>For the latest development snapshot visit
<br>&nbsp;&nbsp;&nbsp;&nbsp;<a target="_blank" href="http://svn.tritarget.org/xmledit/trunk/">http://svn.tritarget.org/xmledit/trunk/</A></td></tr>
 <tr><td>&nbsp;</td></tr>
 <tr><td class="prompt">install details</td></tr>
 <tr><td>This new version has the documentation coupled with the script. You only need one file xml.vim.
<br>
<br>Place this file in your ftplugin directory (i.e. '~/.vim/ftplugin/xml.vim) Type :help ftplugins for more information on installation.
<br>
<br>The documentation will install automatically the first time the plugin is ran. *NOTE* the first time the plugin is ran is NOT the first time VIM is ran. Because this is a file plugin you have to open an XML document to execute the script. So open a new test.xml file at first.
<br>
<br>The html.vim script that came with the old tarball is now in the documentation as an example. to use it just copy/paste it into the file html.vim. See :help xml-plugin-html after the documentation installs.
<br>
<br>ChangeLog and older versions availiable on request.</td></tr>
@@ -204,20 +204,20 @@
     <th valign="top">release notes</th>
 </tr>
 <tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4280">xml.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.29</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-05-14</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=8245">xml.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>65</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2008-02-08</i></td>
+    <td class="rowodd" valign="top" nowrap>7.0</td>
     <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=667">Devin Weaver</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Fixed some documentation. Added &lt;a&gt; tag to html example.
<br>Added Visual select tag mapping. Cosmetics</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=3030">xml.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.20</b></td>
-    <td class="roweven" valign="top" nowrap><i>2004-05-17</i></td>
+    <td class="rowodd" valign="top" width="2000">Several bug fixes and latest development snap shot.</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4280">xml.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.29</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-05-14</i></td>
     <td class="roweven" valign="top" nowrap>6.0</td>
     <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=667">Devin Weaver</a></i></td>
-    <td class="roweven" valign="top" width="2000">New package is self contained. Documentation installs automatically.</td>
+    <td class="roweven" valign="top" width="2000">Fixed some documentation. Added &lt;a&gt; tag to html example.
<br>Added Visual select tag mapping. Cosmetics</td>
 </tr>
 </table>
 <!-- finish off the framework -->

Modified: trunk/packages/vim-scripts/html/index.html
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/index.html?rev=1206&op=diff
==============================================================================
--- trunk/packages/vim-scripts/html/index.html (original)
+++ trunk/packages/vim-scripts/html/index.html Wed Feb 13 19:47:20 2008
@@ -48,7 +48,7 @@
    <li><a href="syntax_mkd.vim.html">syntax/mkd.vim.html</a></li>
   </ul>
   <p>
-  Page generated on Tue, 05 Feb 2008 16:37:58 -0500
+  Page generated on Wed, 13 Feb 2008 14:44:45 -0500
 .
   </p>
  </body>




More information about the pkg-vim-maintainers mailing list