From 2a68e66a93b9d133e66f34a46adb6904ac3caec9 Mon Sep 17 00:00:00 2001
From: Michael Olson <mwolson@gnu.org>
Date: Wed, 14 Dec 2005 00:55:15 +0000
Subject: [PATCH] Merged from muse--main--1.0 (patch 295)

Patches applied:

 * mwolson@gnu.org--2005/muse--main--1.0--patch-295
   muse-wiki: Fix an error that occurs when muse-colors is not loaded.
git-archimport-id: mwolson@gnu.org--2005/muse--rel--3.02--patch-30
---
 ChangeLog         | 19 +++++++++++++++++++
 ChangeLog.main    | 15 +++++++++++++++
 lisp/muse-wiki.el |  7 ++++---
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index feb9983..c68c676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,25 @@
 # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--rel--3.02
 #
 
+2005-12-14 00:55:15 GMT	Michael Olson <mwolson@gnu.org>	patch-30
+
+    Summary:
+      Merged from muse--main--1.0 (patch 295)
+    Revision:
+      muse--rel--3.02--patch-30
+
+    Patches applied:
+    
+     * mwolson@gnu.org--2005/muse--main--1.0--patch-295
+       muse-wiki: Fix an error that occurs when muse-colors is not loaded.
+
+    modified files:
+     ChangeLog ChangeLog.main lisp/muse-wiki.el
+
+    new patches:
+     mwolson@gnu.org--2005/muse--main--1.0--patch-295
+
+
 2005-12-13 04:46:53 GMT	Michael Olson <mwolson@gnu.org>	patch-29
 
     Summary:
diff --git a/ChangeLog.main b/ChangeLog.main
index 269b09f..12dbf89 100644
--- a/ChangeLog.main
+++ b/ChangeLog.main
@@ -2,6 +2,21 @@
 # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0
 #
 
+2005-12-14 00:54:02 GMT	Michael Olson <mwolson@gnu.org>	patch-295
+
+    Summary:
+      muse-wiki: Fix an error that occurs when muse-colors is not loaded.
+    Revision:
+      muse--main--1.0--patch-295
+
+    * lisp/muse-wiki.el (muse-wiki-update-interwiki-regexp): Try to fix an
+      error when muse-colors is not loaded.  Thanks to Stefan van der Walt
+      for the report.
+
+    modified files:
+     ChangeLog lisp/muse-wiki.el
+
+
 2005-12-06 16:54:40 GMT	Michael Olson <mwolson@gnu.org>	patch-283
 
     Summary:
diff --git a/lisp/muse-wiki.el b/lisp/muse-wiki.el
index 2e602c8..5b16c92 100644
--- a/lisp/muse-wiki.el
+++ b/lisp/muse-wiki.el
@@ -41,8 +41,8 @@
 (defun muse-wiki-update-wikiword-regexp (sym val)
   "Update everything related to `muse-wiki-wikiword-regexp'."
   (set sym val)
-  (if (featurep 'muse-colors)
-      (muse-configure-highlighting 'muse-colors-markup muse-colors-markup)))
+  (when (featurep 'muse-colors)
+    (muse-configure-highlighting 'muse-colors-markup muse-colors-markup)))
 
 (defcustom muse-wiki-hide-nop-tag t
   "If non-nil, hide <nop> tags when coloring a Muse buffer."
@@ -106,7 +106,8 @@ and `muse-project-alist'."
                 (when value (concat "\\|" (mapconcat 'car value "\\|")))
                 "\\)\\(?:\\(?:" muse-wiki-interwiki-delimiter
                 "\\)\\(\\sw+\\)\\)?\\>"))
-  (muse-configure-highlighting 'muse-colors-markup muse-colors-markup))
+  (when (featurep 'muse-colors)
+    (muse-configure-highlighting 'muse-colors-markup muse-colors-markup)))
 
 (defcustom muse-wiki-interwiki-alist
   '(("EmacsWiki" . "http://www.emacswiki.org/cgi-bin/wiki/"))
-- 
2.11.4.GIT