* cus-edit.el (custom-browse-insert-prefix):

* emulation/edt.el (edt-x-emacs19-p): Use featurep 'xemacs.

lisp/ChangeLog

+2007-10-28  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* cus-edit.el (custom-browse-insert-prefix):
+	* emulation/edt.el (edt-x-emacs19-p): Use featurep 'xemacs.
+
 2007-10-28  Juanma Barranquero  <lekktu@gmail.com>
 
 	* server.el (server-process-filter): Fix typo in docstring.

lisp/cus-edit.el

@@ -1713,7 +1713,7 @@ item in another window.\n\n"))
 (defun custom-browse-insert-prefix (prefix)
   "Insert PREFIX.  On XEmacs convert it to line graphics."
   ;; Fixme: do graphics.
-  (if nil ; (string-match "XEmacs" emacs-version)
+  (if nil ; (featurep 'xemacs)
       (progn
 	(insert "*")
 	(while (not (string-equal prefix ""))

lisp/emulation/edt.el

@@ -325,7 +325,7 @@ This means that an edt-user.el file was found in the user's `load-path'.")
   "Non-nil if we are running GNU Emacs or XEmacs version 19, or higher.")
 
 (defconst edt-x-emacs19-p
-  (and edt-emacs19-p (string-match "XEmacs" emacs-version))
+  (and edt-emacs19-p (featurep 'xemacs))
   "Non-nil if we are running XEmacs version 19, or higher.")
 
 (defconst edt-gnu-emacs19-p (and edt-emacs19-p (not edt-x-emacs19-p))