From 5f70c1698a43722accd94179bf61e197fe057a55 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 21 May 2013 20:17:22 -0700 Subject: [PATCH] * lisp/vc/ediff.el (ediff-version): Use called-interactively-p on Emacs. --- lisp/ChangeLog | 2 ++ lisp/vc/ediff.el | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d7b7bccc66..cdedd8837d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2013-05-22 Glenn Morris + * vc/ediff.el (ediff-version): Use called-interactively-p on Emacs. + * progmodes/idlw-help.el (idlwave-help-fontify): Use called-interactively-p. diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index aba23b0653..4a4aab7514 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el @@ -1464,9 +1464,9 @@ Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'." "Return string describing the version of Ediff. When called interactively, displays the version." (interactive) - ;; called-interactively-p - not in XEmacs - ;; (if (called-interactively-p 'interactive) - (if (interactive-p) + (if (if (featurep 'xemacs) + (interactive-p) + (called-interactively-p 'interactive)) (message "%s" (ediff-version)) (format "Ediff %s of %s" ediff-version ediff-date))) -- 2.20.1