From a7f58f4be274cdabd21419392c1a6ba54661cd2c Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Sun, 28 Oct 2007 17:39:49 +0000 Subject: [PATCH] * cus-edit.el (custom-browse-insert-prefix): * emulation/edt.el (edt-x-emacs19-p): Use featurep 'xemacs. --- lisp/ChangeLog | 5 +++++ lisp/cus-edit.el | 2 +- lisp/emulation/edt.el | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 30bdbefd98e..f8c4831ae60 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-10-28 Dan Nicolaescu + + * cus-edit.el (custom-browse-insert-prefix): + * emulation/edt.el (edt-x-emacs19-p): Use featurep 'xemacs. + 2007-10-28 Juanma Barranquero * server.el (server-process-filter): Fix typo in docstring. diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 19098367d8f..5e398d46ccf 100644 --- a/lisp/cus-edit.el +++ b/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 "")) diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el index bff1a583586..3ea7ebb5b12 100644 --- a/lisp/emulation/edt.el +++ b/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)) -- 2.11.4.GIT