From 5fca6e11c3a3be6cdfbddc07cd214a25df73ff88 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Thu, 2 Mar 2006 04:25:37 +0000 Subject: [PATCH] Fix #5325: nested formatting not working in HTML output. * lisp/muse-publish.el (muse-publish-markup-word): Make nested emphasis work. I'm a bit worried about possible double-escaping, though. Perhaps we should write the context to a text property and escape it later. This should fix #5325. git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-36 --- ChangeLog.2006 | 16 ++++++++++++++++ lisp/muse-publish.el | 7 +++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ChangeLog.2006 b/ChangeLog.2006 index a8ddc36..3050451 100644 --- a/ChangeLog.2006 +++ b/ChangeLog.2006 @@ -2,6 +2,22 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2006/muse--main--1.0 # +2006-03-02 04:25:37 GMT Michael Olson patch-36 + + Summary: + Fix #5325: nested formatting not working in HTML output. + Revision: + muse--main--1.0--patch-36 + + * lisp/muse-publish.el (muse-publish-markup-word): Make nested emphasis + work. I'm a bit worried about possible double-escaping, though. + Perhaps we should write the context to a text property and escape it + later. This should fix #5325. + + modified files: + ChangeLog.2006 lisp/muse-publish.el + + 2006-03-02 01:08:14 GMT Michael Olson patch-35 Summary: diff --git a/lisp/muse-publish.el b/lisp/muse-publish.el index d871cb6..9f19d6d 100644 --- a/lisp/muse-publish.el +++ b/lisp/muse-publish.el @@ -809,10 +809,9 @@ The following contexts exist in Muse. (delete-region beg end) (setq end (point-marker)) (muse-insert-markup close-tag) - (save-excursion - (goto-char beg) - (muse-insert-markup open-tag) - (setq beg (point))) + (goto-char beg) + (muse-insert-markup open-tag) + (setq beg (point)) (when mark-read-only (muse-publish-escape-specials beg end t context) (muse-publish-mark-read-only beg end))) -- 2.11.4.GIT