From 111bdaffb63bc8d5608f01576149d03e59570b64 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Tue, 16 May 2006 15:53:56 +0000 Subject: [PATCH] Fix emdash in link description bug. * lisp/muse-publish.el (muse-publish-markup-emdash): Don't markup emdash if we are in a link, since otherwise it will be incorrectly escaped. Thanks to Chiyuan Zhang for the report. git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-126 --- ChangeLog.2006 | 16 ++++++++++++++++ Makefile.defs | 2 +- debian/changelog | 4 ++-- lisp/muse-publish.el | 13 +++++++------ 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/ChangeLog.2006 b/ChangeLog.2006 index c452e9d..b7e951d 100644 --- a/ChangeLog.2006 +++ b/ChangeLog.2006 @@ -2,6 +2,22 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2006/muse--main--1.0 # +2006-05-16 15:53:56 GMT Michael Olson patch-126 + + Summary: + Fix emdash in link description bug. + Revision: + muse--main--1.0--patch-126 + + * lisp/muse-publish.el (muse-publish-markup-emdash): Don't markup emdash + if we are in a link, since otherwise it will be incorrectly escaped. + Thanks to Chiyuan Zhang for the report. + + modified files: + ChangeLog.2006 Makefile.defs debian/changelog + lisp/muse-publish.el + + 2006-05-12 04:16:43 GMT Michael Olson patch-125 Summary: diff --git a/Makefile.defs b/Makefile.defs index 7ace930..9b628a0 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -20,6 +20,6 @@ INSTALLINFO = install-info --info-dir=$(INFODIR) #INSTALLINFO = install-info --section "Emacs" "emacs" --info-dir=$(INFODIR) # Useful only for the maintainer -VERSION = 3.02.90.arch.121 +VERSION = 3.02.90.arch.125 LASTUPLOAD = 3.02.6-2 BUILDOPTS = diff --git a/debian/changelog b/debian/changelog index 5a7c8a2..269ebf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -muse-el (3.02.90.arch.121-1) unstable; urgency=low +muse-el (3.02.90.arch.125-1) unstable; urgency=low * New Arch snapshot. - -- Michael W. Olson (GNU address) Mon, 24 Apr 2006 20:33:58 -0400 + -- Michael W. Olson (GNU address) Fri, 12 May 2006 01:27:48 -0400 muse-el (3.02.90.arch.96-1) unstable; urgency=low diff --git a/lisp/muse-publish.el b/lisp/muse-publish.el index c40eecd..fbe02a7 100644 --- a/lisp/muse-publish.el +++ b/lisp/muse-publish.el @@ -827,12 +827,13 @@ The following contexts exist in Muse. nil)) (defun muse-publish-markup-emdash () - (let ((prespace (match-string 1)) - (postspace (match-string 2))) - (delete-region (match-beginning 0) (match-end 0)) - (muse-insert-markup (muse-markup-text 'emdash prespace postspace)) - (when (eq (char-after) ?\<) - (insert ?\n)))) + (unless (get-text-property (match-beginning 0) 'noemphasis) + (let ((prespace (match-string 1)) + (postspace (match-string 2))) + (delete-region (match-beginning 0) (match-end 0)) + (muse-insert-markup (muse-markup-text 'emdash prespace postspace)) + (when (eq (char-after) ?\<) + (insert ?\n))))) (defun muse-publish-markup-enddots () (unless (get-text-property (match-beginning 0) 'noemphasis) -- 2.11.4.GIT