From d445affa90cae05e2eddddea824be67275d24023 Mon Sep 17 00:00:00 2001
From: Michael Olson <mwolson@gnu.org>
Date: Sat, 25 Mar 2006 03:31:36 +0000
Subject: [PATCH] muse-mode: Don't require muse-publish.el.

* lisp/muse-mode.el: Use a few autoloads instead of requiring
  muse-publish.el.  This allows people to optionally have Muse mode
  without including the publishing features, as long as they never call a
  publishing function.  The documentation says that Muse is supposed to
  be modular in that way, so I guess we'd better follow it.
  (muse-insert-tag): Make sure that muse-publish is required before
  accessing `muse-publish-markup-tags'.
git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-69
---
 ChangeLog.2006    | 19 +++++++++++++++++++
 lisp/muse-mode.el | 12 +++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.2006 b/ChangeLog.2006
index c33d068..9061fc3 100644
--- a/ChangeLog.2006
+++ b/ChangeLog.2006
@@ -2,6 +2,25 @@
 # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2006/muse--main--1.0
 #
 
+2006-03-25 03:31:36 GMT	Michael Olson <mwolson@gnu.org>	patch-69
+
+    Summary:
+      muse-mode: Don't require muse-publish.el.
+    Revision:
+      muse--main--1.0--patch-69
+
+    * lisp/muse-mode.el: Use a few autoloads instead of requiring
+      muse-publish.el.  This allows people to optionally have Muse mode
+      without including the publishing features, as long as they never call a
+      publishing function.  The documentation says that Muse is supposed to
+      be modular in that way, so I guess we'd better follow it.
+      (muse-insert-tag): Make sure that muse-publish is required before
+      accessing `muse-publish-markup-tags'.
+
+    modified files:
+     ChangeLog.2006 lisp/muse-mode.el
+
+
 2006-03-21 01:59:03 GMT	Michael Olson <mwolson@gnu.org>	patch-68
 
     Summary:
diff --git a/lisp/muse-mode.el b/lisp/muse-mode.el
index 172fe11..e2d2dd5 100644
--- a/lisp/muse-mode.el
+++ b/lisp/muse-mode.el
@@ -45,9 +45,11 @@
 (require 'muse)
 (require 'muse-regexps)
 (require 'muse-project)
-(require 'muse-publish)
 
 (autoload 'muse-use-font-lock "muse-colors")
+(autoload 'muse-publish-this-file "muse-publish")
+(autoload 'muse-publish-get-style "muse-publish")
+(autoload 'muse-publish-output-file "muse-publish")
 
 (require 'derived)
 (eval-when-compile
@@ -770,12 +772,16 @@ function, you might want to set this manually.")
      (concat "Tag: "
              (when muse-tag-history
                (concat "(default: " (car muse-tag-history) ") ")))
-     (mapcar 'list (nconc (mapcar 'car muse-publish-markup-tags)
-                          muse-custom-tags))
+     (progn
+       (require 'muse-publish)
+       (mapcar 'list (nconc (mapcar 'car muse-publish-markup-tags)
+                            muse-custom-tags)))
      nil nil nil 'muse-tag-history
      (car muse-tag-history))))
   (when (equal tag "")
     (setq tag (car muse-tag-history)))
+  (unless (interactive-p)
+    (require 'muse-publish))
   (let ((tag-entry (assoc tag muse-publish-markup-tags))
         (options ""))
     ;; Add to custom list if no entry exists
-- 
2.11.4.GIT