From 3478bf47fd6d1510b9cb4d5f7c7cf41439e1e0dd Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Tue, 14 Mar 2006 18:41:54 +0000 Subject: [PATCH] Fix #5477: muse-replace-regexp-in-string throws error in XEmacs 21.4 * Makefile.defs, lisp/muse-colors.el: Fix typo. * lisp/muse.el (muse-replace-regexp-in-string): Switch order so that `replace-in-string' is checked before `replace-regexp-in-string', since XEmacs' implementation of the latter seems to be broken. Thanks to Jim Ottaway for the heads up. git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-64 --- ChangeLog.2006 | 18 ++++++++++++++++++ Makefile.defs | 2 +- lisp/muse-colors.el | 2 +- lisp/muse.el | 4 ++-- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ChangeLog.2006 b/ChangeLog.2006 index aa2f76b..98fac04 100644 --- a/ChangeLog.2006 +++ b/ChangeLog.2006 @@ -2,6 +2,24 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2006/muse--main--1.0 # +2006-03-14 18:41:54 GMT Michael Olson patch-64 + + Summary: + Fix #5477: muse-replace-regexp-in-string throws error in XEmacs 21.4 + Revision: + muse--main--1.0--patch-64 + + * Makefile.defs, lisp/muse-colors.el: Fix typo. + + * lisp/muse.el (muse-replace-regexp-in-string): Switch order so that + `replace-in-string' is checked before `replace-regexp-in-string', since + XEmacs' implementation of the latter seems to be broken. Thanks to Jim + Ottaway for the heads up. + + modified files: + ChangeLog.2006 Makefile.defs lisp/muse-colors.el lisp/muse.el + + 2006-03-13 19:38:36 GMT Michael Olson patch-63 Summary: diff --git a/Makefile.defs b/Makefile.defs index b8f8822..2b0e0d0 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -2,7 +2,7 @@ EMACS = emacs SITEFLAG = --no-site-file -# Xemacs users will probably want the following settings. +# XEmacs users will probably want the following settings. #EMACS = xemacs #SITEFLAG = -no-site-file diff --git a/lisp/muse-colors.el b/lisp/muse-colors.el index 6897a51..6388963 100644 --- a/lisp/muse-colors.el +++ b/lisp/muse-colors.el @@ -714,7 +714,7 @@ file." (defun muse-make-file-glyph (filename) "Given a file name, return a newly-created image glyph. -This is a hack for supporting inline images in Xemacs." +This is a hack for supporting inline images in XEmacs." (let ((case-fold-search nil)) ;; Scan filename to determine image type (when (fboundp 'make-glyph) diff --git a/lisp/muse.el b/lisp/muse.el index afb60e6..34891a2 100644 --- a/lisp/muse.el +++ b/lisp/muse.el @@ -306,10 +306,10 @@ omitted, a default message listing FORM itself is used." If fourth arg FIXEDCASE is non-nil, do not alter case of replacement text. If fifth arg LITERAL is non-nil, insert REPLACEMENT literally." (cond - ((fboundp 'replace-regexp-in-string) - (replace-regexp-in-string regexp replacement text fixedcase literal)) ((fboundp 'replace-in-string) (replace-in-string text regexp replacement literal)) + ((fboundp 'replace-regexp-in-string) + (replace-regexp-in-string regexp replacement text fixedcase literal)) (t (let ((repl-len (length replacement)) start) (while (setq start (string-match regexp text start)) -- 2.11.4.GIT