[Emacs-diffs] Changes to emacs/lisp/ediff-help.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/11/09 05:20:59

Index: ediff-help.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-help.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- ediff-help.el       20 Oct 2007 06:30:11 -0000      1.17
+++ ediff-help.el       9 Nov 2007 05:20:56 -0000       1.18
@@ -165,7 +165,7 @@
 
 (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 @@
            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))))