From b6e2140185edb9f233cacc022ea38dbc5b2a3b90 Mon Sep 17 00:00:00 2001
From: Michael Olson <mwolson@gnu.org>
Date: Thu, 17 Nov 2005 05:19:42 +0000
Subject: [PATCH] Miscellaneous safe updates from muse--main--1.0.

* AUTHORS: Housekeeping.

* lisp/muse-html.el (muse-html): Minor wording change.

* lisp/muse-mode.el (muse-mode): Fix compile-time warning.

* muse.texi (Directives): Manual fix.
git-archimport-id: mwolson@gnu.org--2005/muse--rel--3.02--patch-7
---
 AUTHORS           | 5 +++--
 lisp/muse-html.el | 3 +--
 lisp/muse-mode.el | 8 +++++---
 muse.texi         | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 155542b..f41ab1f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -23,8 +23,9 @@ Li Daobing: Contributor, author of muse-mathml.el
 Yann Hodique: Contributor, author of muse-wiki.el
               (assigned past and future changes)
 
-Peter K. Lee: Contributor to muse-xml.el.
-              11 lines changed in muse-publish.el.
+Peter K. Lee: Contributor,
+              muse-xml.el: Ideas and markup strings taken.
+              muse-publish.el: 11 lines changed.
               (assignment pending)
 
 Jim Ottaway: Contributor,
diff --git a/lisp/muse-html.el b/lisp/muse-html.el
index 868c0e8..2caf2e1 100644
--- a/lisp/muse-html.el
+++ b/lisp/muse-html.el
@@ -40,8 +40,7 @@
 (require 'muse-regexps)
 
 (defgroup muse-html nil
-  "Options controlling the behavior of Muse HTML publishing.
-See `muse-html' for more information."
+  "Options controlling the behavior of Muse HTML publishing."
   :group 'muse-publish)
 
 (defcustom muse-html-extension ".html"
diff --git a/lisp/muse-mode.el b/lisp/muse-mode.el
index c7cb2c6..b420041 100644
--- a/lisp/muse-mode.el
+++ b/lisp/muse-mode.el
@@ -175,13 +175,15 @@ so only enable this if you don't use either of these."
   (set (make-local-variable 'paragraph-start)
        (concat paragraph-start "\\|\\s-+\\(-\\|[0-9]+\\.\\)\\s-+"
                "\\|\\[[0-9]+\\]\\s-*"))
-  ;; If we're using Emacs21, this makes flyspell work like it should
-  (setq flyspell-generic-check-word-p 'muse-mode-flyspell-p)
   ;; Comment syntax is `; comment'
   (set (make-local-variable 'comment-start)
        "; ")
+  ;; If we're using Emacs21, this makes flyspell work like it should
+  (when (boundp 'flyspell-generic-check-word-p)
+    (set (make-local-variable 'flyspell-generic-check-word-p)
+         'muse-mode-flyspell-p))
+  ;; If pcomplete is available, set it up
   (when (featurep 'pcomplete)
-    ;; If pcomplete is available, set it up
     (set (make-local-variable 'pcomplete-default-completion-function)
          'muse-mode-completions)
     (set (make-local-variable 'pcomplete-command-completion-function)
diff --git a/muse.texi b/muse.texi
index 4c02bb0..318766c 100644
--- a/muse.texi
+++ b/muse.texi
@@ -548,7 +548,7 @@ If this is not specified, Muse will attempt to figure it out from the
 
 @cindex #date
 @item #date
-The date that the document was originally published.
+The date that the document was last modified.
 
 This is used by publishing styles that are able to embed the date
 information.
-- 
2.11.4.GIT