* lisp/vc/ediff.el (ediff-version): Use called-interactively-p on Emacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7b7bccc6600581d7e065708e1b3cce432d837a6..cdedd8837d76649bd0e80f00d108508171a8a092 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-05-22  Glenn Morris  <rgm@gnu.org>
 
+       * 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 aba23b0653558e00a242974dde1550fe2c0f53b3..4a4aab751441efe14adb87b663562022ab851a6d 100644 (file)
--- 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)))