From: Glenn Morris <rgm@gnu.org>
Date: Wed, 22 May 2013 03:17:22 +0000 (-0700)
Subject: * lisp/vc/ediff.el (ediff-version): Use called-interactively-p on Emacs.
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/5f70c1698a43722accd94179bf61e197fe057a55?hp=b1b7f300fa77d838cfdf47bfc65bfd1c5808d966

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

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  <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 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)))