Skip to content
Browse files

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
  • Loading branch information...
1 parent bc3666d commit 3478bf47fd6d1510b9cb4d5f7c7cf41439e1e0dd @mwolson mwolson committed Mar 14, 2006
Showing with 22 additions and 4 deletions.
  1. +18 −0 ChangeLog.2006
  2. +1 −1 Makefile.defs
  3. +1 −1 lisp/muse-colors.el
  4. +2 −2 lisp/muse.el
View
18 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 <mwolson@gnu.org> 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 <mwolson@gnu.org> patch-63
Summary:
View
2 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
View
2 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)
View
4 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))

0 comments on commit 3478bf4

Please sign in to comment.
Something went wrong with that request. Please try again.