Mercurial > emacs

changeset 92501:956adeeb0083

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
author Glenn Morris <rgm@gnu.org>
date Wed, 05 Mar 2008 08:48:29 +0000
parents 50e6d60be93b
children e0c237a822d5
files lisp/ediff-help.el
diffstat 1 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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..."))