tbabej/taskwiki
1
0
Fork 0
mirror of https://github.com/tbabej/taskwiki.git synced 2025-08-18 21:33:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cache: Get markup_syntax from vimwiki, drop g:taskwiki_markup_syntax

Browse source 
I don't see the point of forcing the user to select this manually in
both vimwiki and taskwiki.
This commit is contained in:
Tomas Janousek 2020-07-28 23:08:27 +02:00 • committed by Tomas Babej
parent 5807945a40
commit 7b67d510cc
3 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
doc/taskwiki.txt
View file

@ -733,13 +733,6 @@ constructs.
Example: Example:
let g:taskwiki_maplocalleader=",t" let g:taskwiki_maplocalleader=",t"
*taskwiki_markup_syntax*
This variable specifies the markup syntax you want to use in your
VimWiki pages. Valid values are "default" and "markdown".
Example:
let g:taskwiki_markup_syntax = "default"
============================================================================= =============================================================================
9. TROUBLESHOOTING *taskwiki-trouble* 9. TROUBLESHOOTING *taskwiki-trouble*

2
taskwiki/cache.py
View file

@ -108,7 +108,7 @@ class TaskCache(object):
default_rc = util.get_var('taskwiki_taskrc_location') or '~/.taskrc' default_rc = util.get_var('taskwiki_taskrc_location') or '~/.taskrc'
default_data = util.get_var('taskwiki_data_location') or None default_data = util.get_var('taskwiki_data_location') or None
extra_warrior_defs = util.get_var('taskwiki_extra_warriors', {}) extra_warrior_defs = util.get_var('taskwiki_extra_warriors', {})
markup_syntax = util.get_var('taskwiki_markup_syntax') or 'default' markup_syntax = vim.eval("vimwiki#vars#get_wikilocal('syntax')") or 'default'
# Validate markup choice and set it # Validate markup choice and set it
if markup_syntax in ["default", "markdown"]: if markup_syntax in ["default", "markdown"]:

3
tests/base.py
View file

@ -69,8 +69,7 @@ class IntegrationTest(object):
def configure_global_variables(self): def configure_global_variables(self):
self.command('let g:taskwiki_data_location="{0}"'.format(self.dir)) self.command('let g:taskwiki_data_location="{0}"'.format(self.dir))
self.command('let g:taskwiki_taskrc_location="{0}"'.format(self.taskrc_path)) self.command('let g:taskwiki_taskrc_location="{0}"'.format(self.taskrc_path))
self.command('let g:vimwiki_list = [{"syntax": "default", "ext": ".txt","path": "%s"}]' % self.dir) self.command('let g:vimwiki_list = [{"syntax": "%s", "ext": ".txt","path": "%s"}]' % (self.markup, self.dir))
self.command('let g:taskwiki_markup_syntax="{0}"'.format(self.markup))
def setup(self): def setup(self):
assert not self.client assert not self.client