diff --git a/lisp/Makefile b/lisp/Makefile index abee058..8fa07a0 100644 --- a/lisp/Makefile +++ b/lisp/Makefile @@ -63,12 +63,14 @@ muse-html.elc: muse-publish.elc muse-regexps.elc muse-xml-common.elc muse-http.elc: muse-html.elc muse-project.elc -muse-ikiwiki.elc: muse-html.elc muse-publish.elc muse.elc +muse-ikiwiki.elc: muse-html.elc muse-ipc.elc muse-publish.elc muse.elc muse-import-docbook.elc: muse-import-xml.elc muse-import-latex.elc: muse-regexps.elc muse.elc +muse-ipc.elc: muse-publish.elc muse.elc + muse-journal.elc: muse-book.elc muse-html.elc muse-latex.elc muse-journal.elc: muse-publish.elc diff --git a/lisp/muse-ikiwiki.el b/lisp/muse-ikiwiki.el index f2c8ec1..a664880 100644 --- a/lisp/muse-ikiwiki.el +++ b/lisp/muse-ikiwiki.el @@ -33,6 +33,7 @@ (require 'muse) (require 'muse-html) +(require 'muse-ipc) (require 'muse-publish) (eval-when-compile @@ -91,7 +92,7 @@ The name of the style is given by STYLE. It defaults to \"ikiwiki\"." (unless title (setq title (muse-page-name name))) (let ((muse-batch-publishing-p t) (muse-publishing-current-file name) - (muse-publishing-current-output-path file) + (muse-publishing-current-output-path name) (muse-publishing-current-style style) (font-lock-verbose nil) (vc-handled-backends nil)) ; don't activate VC when publishing files @@ -120,7 +121,7 @@ The name of the style is given by STYLE. It defaults to \"ikiwiki\"." (setq muse-current-output-style (list :base style :path file)) (muse-with-temp-buffer (muse-insert-file-contents file) - (muse-ikiwiki-publish-buffer name nil nil style) + (muse-ikiwiki-publish-buffer name nil style) (when (muse-write-file output-path t) (muse-style-run-hooks :final style file output-path target))))))