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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/03/05 08:48:30

Index: ediff-help.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-help.el,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- ediff-help.el       8 Jan 2008 20:44:46 -0000       1.20
+++ ediff-help.el       5 Mar 2008 08:48:29 -0000       1.21
@@ -190,15 +190,12 @@
   (let ((pos (ediff-event-point last-command-event))
        overl cmd)
 
-    (ediff-cond-compile-for-xemacs-or-emacs
-     ;; xemacs
+    (if (featurep '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))))
-     )
+                            (overlays-at pos)))))
 
     (if (not (stringp cmd))
        (error "Hmm...  I don't see an Ediff command around here..."))