# HG changeset patch # User Glenn Morris # Date 1204706909 0 # Node ID 956adeeb0083867daad953a97caebb0620ee98f4 # Parent 50e6d60be93b4a4102c68ac86019efc2306dd946 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test. diff -r 50e6d60be93b -r 956adeeb0083 lisp/ediff-help.el --- a/lisp/ediff-help.el Wed Mar 05 08:48:11 2008 +0000 +++ b/lisp/ediff-help.el Wed Mar 05 08:48:29 2008 +0000 @@ -190,15 +190,12 @@ (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..."))