From 4cec500eeb0dcf0c0544b7b44fd29fda2ac7f1dd Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Mon, 30 Oct 2006 05:27:07 +0000 Subject: [PATCH] Fix goofy assertion 2006-10-30 Michael Olson * lisp/muse-wiki.el (muse-wiki-update-interwiki-regexp): Fix bug introduced yesterday. git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-236 --- ChangeLog | 8 ++++++-- lisp/muse-wiki.el | 44 ++++++++++++++++++++++---------------------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index f970ef1..8587746 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-30 Michael Olson + + * lisp/muse-wiki.el (muse-wiki-update-interwiki-regexp): Fix bug + introduced yesterday. + 2006-10-29 Michael Olson * examples/mwolson: Update my example configuration. @@ -11,8 +16,7 @@ report. * lisp/muse-project.el (muse-project-find-file): Permit non-Muse - files in projects to be linked to, though it isn't yet sure - whether they will publish correctly. + files in projects to be linked to. * lisp/muse-publish.el (muse-publish-url): Allow the original link to serve as a description for a URL, as long as it differs from diff --git a/lisp/muse-wiki.el b/lisp/muse-wiki.el index 71590e3..39984d9 100644 --- a/lisp/muse-wiki.el +++ b/lisp/muse-wiki.el @@ -157,29 +157,29 @@ If you want this replacement to happen, you must add (defun muse-wiki-update-interwiki-regexp () "Update the value of `muse-wiki-interwiki-regexp' based on `muse-wiki-interwiki-alist' and `muse-project-alist'." - (muse-assert (consp muse-project-alist)) - (setq muse-wiki-interwiki-regexp - (concat "\\<\\(" (regexp-opt (mapcar #'car muse-project-alist)) - (when muse-wiki-interwiki-alist - (let ((interwiki-rules (mapcar #'car - muse-wiki-interwiki-alist))) - (when interwiki-rules - (concat "\\|" (regexp-opt interwiki-rules))))) - "\\)\\(?:\\(?:" muse-wiki-interwiki-delimiter - "\\)\\(" - (when muse-wiki-match-all-project-files + (when muse-project-alist + (setq muse-wiki-interwiki-regexp + (concat "\\<\\(" (regexp-opt (mapcar #'car muse-project-alist)) + (when muse-wiki-interwiki-alist + (let ((interwiki-rules (mapcar #'car + muse-wiki-interwiki-alist))) + (when interwiki-rules + (concat "\\|" (regexp-opt interwiki-rules))))) + "\\)\\(?:\\(?:" muse-wiki-interwiki-delimiter + "\\)\\(" + (when muse-wiki-match-all-project-files ;; append the files from the project - (let ((files nil)) - (dolist (proj muse-project-alist) - (setq files - (nconc (muse-wiki-project-files-with-spaces - (car proj)) - files))) - (when files - (concat (regexp-opt files) "\\|")))) - "\\sw+\\)\\)?\\>")) - (when (featurep 'muse-colors) - (muse-configure-highlighting 'muse-colors-markup muse-colors-markup))) + (let ((files nil)) + (dolist (proj muse-project-alist) + (setq files + (nconc (muse-wiki-project-files-with-spaces + (car proj)) + files))) + (when files + (concat (regexp-opt files) "\\|")))) + "\\sw+\\)\\)?\\>")) + (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