From 6ed4df51aa6fdac611f6a098651892826ce22d6b Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Thu, 1 Jun 2006 04:05:33 +0000 Subject: [PATCH] Second attempt at fixing XEmacs beta problem. * lisp/Makefile (ELC): Revert previous change, now that I have a hunch about what causes the problem. * lisp/muse-publish.el (muse-publish-markup-regexps): Move anchor markup lower to future-proof an idea that I have. (muse-style-element): Make this a function instead of a substitution, especially since it is potentially recursive. git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-149 --- ChangeLog | 19 +++++++++++++++++++ lisp/Makefile | 3 +-- lisp/muse-publish.el | 8 ++++---- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 862cdeb..c27b761 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,25 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2006/muse--main--1.0 # +2006-06-01 04:05:33 GMT Michael Olson patch-149 + + Summary: + Second attempt at fixing XEmacs beta problem. + Revision: + muse--main--1.0--patch-149 + + * lisp/Makefile (ELC): Revert previous change, now that I have a hunch + about what causes the problem. + + * lisp/muse-publish.el (muse-publish-markup-regexps): Move anchor markup + lower to future-proof an idea that I have. + (muse-style-element): Make this a function instead of a substitution, + especially since it is potentially recursive. + + modified files: + ChangeLog ChangeLog.2005 lisp/Makefile lisp/muse-publish.el + + 2006-06-01 03:47:49 GMT Michael Olson patch-148 Summary: diff --git a/lisp/Makefile b/lisp/Makefile index 8854105..482715e 100644 --- a/lisp/Makefile +++ b/lisp/Makefile @@ -4,8 +4,7 @@ include ../Makefile.defs EL = $(filter-out muse-autoloads.el,$(wildcard *.el)) -ELC_IN = $(patsubst %.el,%.elc,$(EL)) -ELC = muse-publish.elc $(filter-out muse-publish.elc,$(ELC_IN)) +ELC = $(patsubst %.el,%.elc,$(EL)) all: lisp diff --git a/lisp/muse-publish.el b/lisp/muse-publish.el index 5ee89a8..485c7e7 100644 --- a/lisp/muse-publish.el +++ b/lisp/muse-publish.el @@ -102,9 +102,6 @@ If non-nil, publish comments using the markup of the current style." ;; prevent emphasis characters in explicit links from being marked (1400 muse-explicit-link-regexp 0 muse-publish-mark-link) - ;; define anchor points - (1500 "^\\(\\W*\\)#\\(\\S-+\\)\\s-*" 0 anchor) - ;; emphasized or literal text (1600 ,(concat "\\(^\\|[-[" muse-regexp-blank "<('`\"\n]\\)\\(=[^=" muse-regexp-blank @@ -162,6 +159,9 @@ If non-nil, publish comments using the markup of the current style." ;; (see below). (2600 ,(concat "^[" muse-regexp-blank "]*> ") 0 verse) + ;; define anchor points + (2700 "^\\(\\W*\\)#\\(\\S-+\\)\\s-*" 0 anchor) + ;; replace links in the buffer (links to other pages) (2900 muse-explicit-link-regexp 0 link) @@ -350,7 +350,7 @@ If STYLE is not specified, use current style." (setq style (muse-get-keyword :base style))) elements)) -(defsubst muse-style-element (elem &optional style direct) +(defun muse-style-element (elem &optional style direct) "Search for ELEM in STYLE, including base styles. If STYLE is not specified, use current style." (setq style (muse-style style)) -- 2.11.4.GIT