From: yamaoka <yamaoka>
Date: Thu, 19 Apr 2001 05:21:06 +0000 (+0000)
Subject: * mu-cite.el (mu-cite-remove-text-properties): Make it to work with XEmacs.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58d6ad7f9eac08cc22912851df721d460f268bdd;p=elisp%2Fmu-cite.git

* mu-cite.el (mu-cite-remove-text-properties): Make it to work with XEmacs.
---

diff --git a/ChangeLog b/ChangeLog
index e6c7151..9714ebd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-19  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+	* mu-cite.el (mu-cite-remove-text-properties): Make it to work with
+	XEmacs.
+
 2001-03-22  NISHIDA Masakazu  <m_nisida@ca2.so-net.ne.jp>
 
 	* mu-register.el (mu-cite-get-prefix-register-verbose-method):
diff --git a/mu-cite.el b/mu-cite.el
index 23f3e36..c125289 100644
--- a/mu-cite.el
+++ b/mu-cite.el
@@ -70,13 +70,19 @@
 
 (defmacro mu-cite-remove-text-properties (string)
   "Remove text properties from STRING which is read from minibuffer."
-  (if (or (featurep 'xemacs)
-	  (boundp 'minibuffer-allow-text-properties);; Emacs 20.1 or later.
-	  (not (fboundp 'set-text-properties)));; under Emacs 19.7.
-      string
-    (` (let ((obj (copy-sequence (, string))))
-	 (set-text-properties 0 (length obj) nil obj)
-	 obj))))
+  (cond ((featurep 'xemacs)
+	 (` (let ((string (copy-sequence (, string))))
+	      (map-extents (function (lambda (extent maparg)
+				       (delete-extent extent))
+				     string 0 (length string)))
+	      string)))
+	((or (boundp 'minibuffer-allow-text-properties);; Emacs 20.1 or later.
+	     (not (fboundp 'set-text-properties)));; under Emacs 19.7.
+	 string)
+	(t
+	 (` (let ((string (copy-sequence (, string))))
+	      (set-text-properties 0 (length string) nil string)
+	      string)))))
 
 
 ;;; @ set up