Merge remote-tracking branch 'vimwiki/dev' into 'vimwiki/tags'

Conflicts:
	doc/vimwiki.txt
	ftplugin/vimwiki.vim
This commit is contained in:
Ivan Tishchenko
2015-02-12 22:20:16 +03:00
15 changed files with 254 additions and 233 deletions

View File

@ -964,7 +964,7 @@ In HTML the following part >
| Year | Temperature (low) | Temperature (high) |
|------|-------------------|--------------------|
>
is higlighted as a table header.
is highlighted as a table header.
If you indent a table then it will be centered in HTML.
@ -1917,7 +1917,7 @@ See |vimwiki-option-template_path| for details.
*vimwiki-option-template_ext*
------------------------------------------------------------------------------
Key Default value~
template_ext .html
template_ext .tpl
Description~
Setup template filename extension.
@ -2625,6 +2625,19 @@ before the plugin loads. >
The default is '<Leader>w'.
------------------------------------------------------------------------------
*g:vimwiki_auto_chdir*
When set to 1, enables auto-cd feature. Whenever vimwiki page is opened,
vimwiki performs an |:lcd| to the vimwiki folder to where the page belongs.
Value Description~
0 Do not change directory.
1 Change directory to vimwiki folder on opening page.
Default: 0
==============================================================================
13. Miscellaneous *vimwiki-misc*
@ -2665,6 +2678,7 @@ Vim plugins: http://www.vim.org/scripts/script.php?script_id=2226
???~
* Support for tags.
* Spport for |g:vimwiki_auto_chdir| option.
* Support for anchors, see |vimwiki-anchors|
* in this context, add support for TOC, see |vimwiki-toc|
* remove the now useless %toc placeholder