* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.

[gnu-emacs] / lisp / ediff-help.el

diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el
index 1c7a72870fe44599ec38cd336e1fdf484cbed6da..0c37be313723dfa4a5ca64eaadde6755c3204061 100644 (file)
--- a/lisp/ediff-help.el
+++ b/lisp/ediff-help.el
@@ -165,7 +165,7 @@ the value of this variable and the variables `ediff-help-message-*' in
 
 (define-key
   ediff-help-region-map
-  (if ediff-emacs-p [mouse-2] [button2])
+  (if (featurep 'emacs) [mouse-2] [button2])
   'ediff-help-for-quick-help)
 
 ;; runs in the control buffer
@@ -177,7 +177,7 @@ the value of this variable and the variables `ediff-help-message-*' in
            end (match-end 0)
            cmd (buffer-substring (match-beginning 1) (match-end 1)))
       (setq overl (ediff-make-overlay beg end))
-      (if ediff-emacs-p
+      (if (featurep 'emacs)
          (ediff-overlay-put overl 'mouse-face 'highlight)
        (ediff-overlay-put overl 'highlight t))
       (ediff-overlay-put overl 'ediff-help-info cmd))))