summaryrefslogtreecommitdiff
path: root/runtime/plugin
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-10-13 23:21:27 +0200
committerBram Moolenaar <Bram@vim.org>2015-10-13 23:21:27 +0200
commit60cce2fb736c8ff6fdb9603f502d3c15f1f7a25d (patch)
tree6e3cfa244f7b4598c052799d89004eae80382d24 /runtime/plugin
parent04dfd512293e951479aec2378753b946c39bea87 (diff)
downloadvim-git-60cce2fb736c8ff6fdb9603f502d3c15f1f7a25d.tar.gz
Update runtime files.
Diffstat (limited to 'runtime/plugin')
-rw-r--r--runtime/plugin/tohtml.vim35
1 files changed, 19 insertions, 16 deletions
diff --git a/runtime/plugin/tohtml.vim b/runtime/plugin/tohtml.vim
index eb47b1a7c..b438dea81 100644
--- a/runtime/plugin/tohtml.vim
+++ b/runtime/plugin/tohtml.vim
@@ -1,6 +1,6 @@
" Vim plugin for converting a syntax highlighted file to HTML.
" Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2013 Jul 08
+" Last Change: 2015 Sep 08
"
" The core of the code is in $VIMRUNTIME/autoload/tohtml.vim and
" $VIMRUNTIME/syntax/2html.vim
@@ -67,20 +67,24 @@
if exists('g:loaded_2html_plugin')
finish
endif
-let g:loaded_2html_plugin = 'vim7.4_v1'
+let g:loaded_2html_plugin = 'vim7.4_v2'
"
" Changelog: {{{
-" 7.4_v1 (this version): Fix modeline mangling for new "Vim:" format, and
+" 7.4_v2 (this version): Fix error raised when converting a diff containing
+" an empty buffer. Jan Stocker: allow g:html_font to
+" take a list so it is easier to specfiy fallback
+" fonts in the generated CSS.
+" 7.4_v1 (Vim 7.4.0000): Fix modeline mangling for new "Vim:" format, and
" also for version-specific modelines like "vim>703:".
"
" 7.3 updates: {{{
-" 7.3_v14 (ad6996a23e3e): Allow suppressing line number anchors using
+" 7.3_v14 (Vim 7.3.1246): Allow suppressing line number anchors using
" g:html_line_ids=0. Allow customizing
" important IDs (like line IDs and fold IDs) using
" g:html_id_expr evalutated when the buffer conversion
" is started.
-" 7.3_v13 (2eb30f341e8d): Keep foldmethod at manual in the generated file and
+" 7.3_v13 (Vim 7.3.1088): Keep foldmethod at manual in the generated file and
" insert modeline to set it to manual.
" Fix bug: diff mode with 2 unsaved buffers creates a
" duplicate of one buffer instead of including both.
@@ -91,7 +95,7 @@ let g:loaded_2html_plugin = 'vim7.4_v1'
" Fix XML validation error: &nsbp; not part of XML.
" Allow TOhtml to chain together with other commands
" using |.
-" 7.3_v12 (9910cbff5f16): Fix modeline mangling to also work for when multiple
+" 7.3_v12 (Vim 7.3.0616): Fix modeline mangling to also work for when multiple
" highlight groups make up the start-of-modeline text.
" Improve render time of page with uncopyable regions
" by not using one-input-per-char. Change name of
@@ -117,23 +121,23 @@ let g:loaded_2html_plugin = 'vim7.4_v1'
" http://groups.google.com/d/topic/vim_dev/B6FSGfq9VoI/discussion.
" This patch has not yet been included in Vim, thus
" these changes are removed in the next version.
-" 7.3_v10 (fd09a9c8468e): Fix error E684 when converting a range wholly inside
+" 7.3_v10 (Vim 7.3.0227): Fix error E684 when converting a range wholly inside
" multiple nested folds with dynamic folding on.
" Also fix problem with foldtext in this situation.
-" 7.3_v9 (0877b8d6370e): Add html_pre_wrap option active with html_use_css
+" 7.3_v9 (Vim 7.3.0170): Add html_pre_wrap option active with html_use_css
" and without html_no_pre, default value same as
" 'wrap' option, (Andy Spencer). Don't use
" 'fileencoding' for converted document encoding if
" 'buftype' indicates a special buffer which isn't
" written.
-" 7.3_v8 (85c5a72551e2): Add html_expand_tabs option to allow leaving tab
+" 7.3_v8 (Vim 7.3.0100): Add html_expand_tabs option to allow leaving tab
" characters in generated output (Andy Spencer).
" Escape text that looks like a modeline so Vim
" doesn't use anything in the converted HTML as a
" modeline. Bugfixes: Fix folding when a fold starts
" before the conversion range. Remove fold column when
" there are no folds.
-" 7.3_v7 (840c3cadb842): see betas released on vim_dev below:
+" 7.3_v7 (Vim 7-3-0063): see betas released on vim_dev below:
" 7.3_v7b3: Fixed bug, convert Unicode to UTF-8 all the way.
" 7.3_v7b2: Remove automatic detection of encodings that are not
" supported by all major browsers according to
@@ -147,23 +151,22 @@ let g:loaded_2html_plugin = 'vim7.4_v1'
" charset, and make sure the 'fenc' of the generated
" file matches its indicated charset. Add charsets for
" all of Vim's natively supported encodings.
-" 7.3_v6 (0d3f0e3d289b): Really fix bug with 'nowrapscan', 'magic' and other
+" 7.3_v6 (Vim 7.3.0000): Really fix bug with 'nowrapscan', 'magic' and other
" user settings interfering with diff mode generation,
" trailing whitespace (e.g. line number column) when
" using html_no_pre, and bugs when using
" html_hover_unfold.
" 7.3_v5 ( unreleased ): Fix bug with 'nowrapscan' and also with out-of-sync
" folds in diff mode when first line was folded.
-" 7.3_v4 (7e008c174cc3): Bugfixes, especially for xhtml markup, and diff mode
-" 7.3_v3 (a29075150aee): Refactor option handling and make html_use_css
+" 7.3_v4 (Vim 7.3.0000): Bugfixes, especially for xhtml markup, and diff mode
+" 7.3_v3 (Vim 7.3.0000): Refactor option handling and make html_use_css
" default to true when not set to anything. Use strict
" doctypes where possible. Rename use_xhtml option to
" html_use_xhtml for consistency. Use .xhtml extension
" when using this option. Add meta tag for settings.
-" 7.3_v2 (80229a724a11): Fix syntax highlighting in diff mode to use both the
+" 7.3_v2 (Vim 7.3.0000): Fix syntax highlighting in diff mode to use both the
" diff colors and the normal syntax colors
-" 7.3_v1 (e7751177126b): Add conceal support and meta tags in output
-" Pre-v1 baseline: Mercurial changeset 3c9324c0800e
+" 7.3_v1 (Vim 7.3.0000): Add conceal support and meta tags in output
"}}}
"}}}