Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.

diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index b690bfb..00060a9 100644 (file)
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -1311,7 +1311,7 @@ These characters are ignored when differing regions are split into words.")
 (make-variable-buffer-local 'ediff-whitespace)
 
 (defvar ediff-word-1
-  (ediff-cond-compile-for-xemacs-or-emacs "a-zA-Z---_" "-[:word:]_")
+  (if (featurep 'xemacs) "a-zA-Z---_" "-[:word:]_")
   "*Characters that constitute words of type 1.
 More precisely, [ediff-word-1] is a regexp that matches type 1 words.
 See `ediff-forward-word' for more details.")

diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el
index 97da0d8..988fc91 100644 (file)
--- a/lisp/ediff-help.el
+++ b/lisp/ediff-help.el
@@ -190,15 +190,12 @@ the value of this variable and the variables `ediff-help-message-*' in
   (let ((pos (ediff-event-point last-command-event))
        overl cmd)
 
-    (ediff-cond-compile-for-xemacs-or-emacs
-     ;; xemacs
-     (setq overl (extent-at pos (current-buffer) 'ediff-help-info)
-          cmd   (ediff-overlay-get overl 'ediff-help-info))
-     ;; emacs
-     (setq cmd (car (mapcar (lambda (elt)
-                             (overlay-get elt 'ediff-help-info))
-                           (overlays-at pos))))
-     )
+    (if (featurep 'xemacs)
+       (setq overl (extent-at pos (current-buffer) 'ediff-help-info)
+             cmd   (ediff-overlay-get overl 'ediff-help-info))
+      (setq cmd (car (mapcar (lambda (elt)
+                              (overlay-get elt 'ediff-help-info))
+                            (overlays-at pos)))))
 
     (if (not (stringp cmd))
        (error "Hmm...  I don't see an Ediff command around here..."))