Merge commit 'upstream/master'

diff --git a/doc/ikiwiki/markdown.mdwn b/doc/ikiwiki/markdown.mdwn
index 3bebaef65e08553a5ecf7ccec42d93290cd1bbc8..94864c489214549b20ddf7b43886d43bf188b679 100644 (file)
--- a/doc/ikiwiki/markdown.mdwn
+++ b/doc/ikiwiki/markdown.mdwn
@@ -6,8 +6,7 @@ email messages. It is the markup language used by this wiki by default.
 For documentation about the markdown syntax, see [[formatting]] and
 [Markdown: syntax](http://daringfireball.net/projects/markdown/syntax). A
 [markdown mode](http://jblevins.org/projects/markdown-mode/) for 
-emacs can help in editing, as can this
-[syntax file](http://plasticboy.com/markdown-vim-mode/) for vim.
+emacs can help in editing, as can the [[vim_syntax_highlighting]] file.
 
 Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part
 of the markdown syntax, and are the only bit of markup that this wiki

diff --git a/doc/plugins/format/discussion.mdwn b/doc/plugins/format/discussion.mdwn
index b7d6ca71cfbda9ae6c8f373415bfe70288ac7e8a..df8448ed61855e0938b311a9082a5b3ab85531ec 100644 (file)
--- a/doc/plugins/format/discussion.mdwn
+++ b/doc/plugins/format/discussion.mdwn
@@ -3,3 +3,13 @@ Is there any way to tell if an htmlize hook have been called from a format direc
 I am currently modifying the [[contrib/highlightcode]] plugin by [[sabr]] and I wanted to have a different behavior depending on the fact that the htmlize hook is called from a format directive or not. For instance, this could disable the raw copy of the highlighted code. Since I have enabled the keepextension option, I tried to rely on the page extension to decide whenever I have to create the raw file or not but this does not seems a reliable approach.
 
 One possible solution is to add an optional parameter to the htmlize hook (and thus to htmlize function in IkiWiki.pm) which could tell if this is the format directive that called the function but I am not sure that is a good way to do this.
+
+> It's (probably) not just the format directive that has a potential problem here.
+> Imagine a syntax highlighted source code file that contains some other
+> directive, such as table or meta. Such a directive calls `htmlize` on the
+> parameters passed to it.
+> 
+> There is one way to detect this ATM. If `%IkiWiki::preprocessing` has
+> anything in it, then ikiwiki is in the middle of handling a preprocessing
+> directive. So you could check that. It's getting into internals, so not
+> ideal.. --[[Joey]]

diff --git a/doc/tips/vim_syntax_highlighting/discussion.mdwn b/doc/tips/vim_syntax_highlighting/discussion.mdwn
index b1637e7584845af0a9c448b03db3b90c335d9052..038854b9fb5564b8cf28a28d5039d51619bae411 100644 (file)
--- a/doc/tips/vim_syntax_highlighting/discussion.mdwn
+++ b/doc/tips/vim_syntax_highlighting/discussion.mdwn
@@ -1 +1,8 @@
 I'm going to look at merging this with potwiki.vim (a vim-based personal wiki) so that you can follow wiki-links and auto-create pages etc., direct from vim. (I'm writing this incase I don't get around to it) -- [[JonDowland]]
+
+----
+
+Another attempt at the same thing is here:
+<http://plasticboy.com/markdown-vim-mode/>
+
+In my tests, [[ikiwiki.vim]] works better than that one, YMMV. --[[Joey]]