Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

master
Joey Hess 2010-02-11 16:29:38 -05:00
commit ac8f03aa06
1 changed files with 4 additions and 1 deletions

View File

@ -85,6 +85,9 @@ the plugin has, as of now, two problems:
>>>>> plugin and putting it there, I'd be fine with that. I think it needs >>>>> plugin and putting it there, I'd be fine with that. I think it needs
>>>>> some slight work to catch up with changes to ikiwiki's directives >>>>> some slight work to catch up with changes to ikiwiki's directives
>>>>> (!-prefixed now), and wikilinks (able to have spaces now). --[[Joey]] >>>>> (!-prefixed now), and wikilinks (able to have spaces now). --[[Joey]]
>>>>>
>>>>>> I don't really know too much about syntax definitions in vim. But I'll give it a stab. I know it fails when there are 2 \[[my text|link]] wikilinks in the same page.
>>>>>> I'm not promising anything, though ;) --[[jerojasro]]
> >
> Also, I have a possible other approach for finding ikiwiki's root. One > Also, I have a possible other approach for finding ikiwiki's root. One
> could consider that any subdirectory of an ikiwiki wiki is itself > could consider that any subdirectory of an ikiwiki wiki is itself