From 264f9ee0d877a641d5000a1933b2e13c9b0b9c3e Mon Sep 17 00:00:00 2001
From: Michael Olson <mwolson@gnu.org>
Date: Thu, 7 Jul 2005 05:57:51 +0000
Subject: [PATCH] Note that muse-file-extension should not have "." in front.

* lisp/muse-project.el (muse-project-find-file): Handle case where
  muse-file-extension is not specified.

* lisp/muse.el (muse-file-extension): Note that the period at the
  beginning of this value should be omitted.

* lisp/muse-regexps.el (muse-update-ignored-extensions-regexp): Quote
  file extension so that regexp characters inside the extension will not
  goof it up.  This should never be a problem in normal cases, but let's
  be robust.

git-archimport-id: mwolson@gnu.org--2005/muse--main--1.0--patch-101
---
 ChangeLog            | 24 ++++++++++++++++++++++++
 lisp/muse-project.el |  8 +++++---
 lisp/muse-regexps.el |  2 +-
 lisp/muse.el         |  2 +-
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3eb76b4..e3138ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,30 @@
 # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0
 #
 
+2005-07-07 05:57:51 GMT	Michael Olson <mwolson@gnu.org>	patch-101
+
+    Summary:
+      Note that muse-file-extension should not have "." in front.
+    Revision:
+      muse--main--1.0--patch-101
+
+    * lisp/muse-project.el (muse-project-find-file): Handle case where
+      muse-file-extension is not specified.
+    
+    * lisp/muse.el (muse-file-extension): Note that the period at the
+      beginning of this value should be omitted.
+    
+    * lisp/muse-regexps.el (muse-update-ignored-extensions-regexp): Quote
+      file extension so that regexp characters inside the extension will not
+      goof it up.  This should never be a problem in normal cases, but let's
+      be robust.
+    
+
+    modified files:
+     ChangeLog lisp/muse-project.el lisp/muse-regexps.el
+     lisp/muse.el
+
+
 2005-07-07 05:36:53 GMT	Michael Olson <mwolson@gnu.org>	patch-100
 
     Summary:
diff --git a/lisp/muse-project.el b/lisp/muse-project.el
index 0c7f207..0726855 100644
--- a/lisp/muse-project.el
+++ b/lisp/muse-project.el
@@ -259,9 +259,11 @@ first directory within the project's fileset is used."
                 (setq directory (car pats) pats nil)
               (setq pats (cdr pats))))))
       (when directory
-        (let ((filename (expand-file-name (concat (car name)
-                                                  muse-file-extension)
-                                          directory)))
+        (let ((filename (expand-file-name
+                         (if muse-file-extension
+                             (concat (car name) "." muse-file-extension)
+                           (car name))
+                         directory)))
           (unless (file-exists-p directory)
             (make-directory directory t))
           (setcdr name filename))))
diff --git a/lisp/muse-regexps.el b/lisp/muse-regexps.el
index 8fae761..9f845a2 100644
--- a/lisp/muse-regexps.el
+++ b/lisp/muse-regexps.el
@@ -217,7 +217,7 @@ This is autogenerated from `muse-ignored-extensions'.")
   (if val
       (setq muse-wiki-ignored-extensions-regexp
             (concat "\\.\\("
-                    muse-file-extension "\\|"
+                    (regexp-quote muse-file-extension) "\\|"
                     (mapconcat 'identity muse-ignored-extensions "\\|")
                     "\\)\\'"))
     (setq muse-wiki-ignored-extensions-regexp
diff --git a/lisp/muse.el b/lisp/muse.el
index 417bb1f..66e2712 100644
--- a/lisp/muse.el
+++ b/lisp/muse.el
@@ -285,7 +285,7 @@ function."
 ;; Default file extension
 
 (defcustom muse-file-extension nil
-  "File extension of Muse files."
+  "File extension of Muse files.  Omit the period at the beginning."
   :type '(choice
           (const :tag "None" nil)
           (string))
-- 
2.11.4.GIT