Skip to content
Browse files

Merge branch 'hotfix/1.9.1'

  • Loading branch information...
2 parents 493f622 + 4755449 commit adeec4ac8cb83518f7e18f1ac183fb3947f3a16e @sukima committed
Showing with 11 additions and 6 deletions.
  1. +2 −2 README.mkd
  2. +6 −1 doc/xml-plugin.txt
  3. +3 −3 ftplugin/xml.vim
View
4 README.mkd
@@ -2,8 +2,8 @@ xml-plugin
==========
Maintainer: Devin Weaver <suki@tritarget.org>
Source: <http://github.com/sukima/xmledit>
-Homepage: <http://www.vim.org/scripts/script.php?script_id=301>
-Version: 1.9.0
+Homepage: <http://www.vim.org/scripts/script.php?script_id=301>
+Version: 1.9.1
XML Edit is a file type plugin to help edit XML documents.
It includes tag completion and tag jumping.
View
7 doc/xml-plugin.txt
@@ -4,7 +4,7 @@
A filetype plugin to help edit XML and SGML documents.
-Version: 1.9.0
+Version: 1.9.1
This script provides some convenience when editing XML (and some SGML
including HTML) formated documents. It allows you to jump to the beginning
@@ -31,6 +31,11 @@ NOTE: If you used the VIM 5.x version of this file (xmledit.vim) you'll need
to comment out the section where you called it. It is no longer used in the
VIM 6.x version.
+To disable the plugin (especially for systems that include this plugin as part
+of the distrobution) you can use the following line in your .vimrc:
+>
+ let loaded_xmledit = 1
+<
Known Bugs
- This script will modify registers ". and "x; register "" will be restored.
View
6 ftplugin/xml.vim
@@ -2,8 +2,8 @@
" FileType: XML
" Author: Devin Weaver <suki (at) tritarget.com>
" Maintainer: Devin Weaver <suki (at) tritarget.com>
-" Last Change: Fri Apr 10 17:47:11 EDT 2009
-" Version: 1.9.0
+" Last Change: Thu Jul 22 16:06:01 EDT 2010
+" Version: 1.9.1
" 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
@@ -32,7 +32,7 @@
"==============================================================================
" Only do this when not done yet for this buffer
-if exists("b:did_ftplugin")
+if exists("b:did_ftplugin") || exists("loaded_xmledit")
finish
endif
" sboles, init these variables so vim doesn't complain on wrap cancel

0 comments on commit adeec4a

Please sign in to comment.
Something went wrong with that request. Please try again.