From 25f2df4ebdf617b077de7fac14f1ac13a598a8c6 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Fri, 16 Dec 2005 21:30:52 +0000 Subject: [PATCH] Merged from mwolson@gnu.org--2005 (patch 302) Patches applied: * mwolson@gnu.org--2005/muse--main--1.0--patch-302 muse-html: Fix regexp error. git-archimport-id: mwolson@gnu.org--2005/muse--rel--3.02--patch-34 --- ChangeLog | 19 +++++++++++++++++++ ChangeLog.main | 14 ++++++++++++++ lisp/muse-html.el | 2 +- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 727164e..677a08e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,25 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--rel--3.02 # +2005-12-16 21:30:52 GMT Michael Olson patch-34 + + Summary: + Merged from mwolson@gnu.org--2005 (patch 302) + Revision: + muse--rel--3.02--patch-34 + + Patches applied: + + * mwolson@gnu.org--2005/muse--main--1.0--patch-302 + muse-html: Fix regexp error. + + modified files: + ChangeLog ChangeLog.main lisp/muse-html.el + + new patches: + mwolson@gnu.org--2005/muse--main--1.0--patch-302 + + 2005-12-16 16:44:02 GMT Michael Olson patch-33 Summary: diff --git a/ChangeLog.main b/ChangeLog.main index cc93de9..052711f 100644 --- a/ChangeLog.main +++ b/ChangeLog.main @@ -2,6 +2,20 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0 # +2005-12-16 21:29:58 GMT Michael Olson patch-302 + + Summary: + muse-html: Fix regexp error. + Revision: + muse--main--1.0--patch-302 + + * lisp/muse-html.el (muse-html-escape-string): Fix error in regexp + string. + + modified files: + ChangeLog lisp/muse-html.el + + 2005-12-16 16:42:46 GMT Michael Olson patch-298 Summary: diff --git a/lisp/muse-html.el b/lisp/muse-html.el index 2caf2e1..003aaa0 100644 --- a/lisp/muse-html.el +++ b/lisp/muse-html.el @@ -482,7 +482,7 @@ if not escaped." (save-match-data (while (setq pos (string-match (concat "[^-" muse-regexp-alnum - "/:._=@\\?~#]\"<>&;") + "/:._=@\\?~#\"<>&;]") str pos)) (setq ch (aref str pos) code (concat "&#" -- 2.11.4.GIT