* lisp/vc/ediff.el (ediff-version): Use called-interactively-p on Emacs.
authorGlenn Morris <rgm@gnu.org>
Wed, 22 May 2013 03:17:22 +0000 (20:17 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 22 May 2013 03:17:22 +0000 (20:17 -0700)
lisp/ChangeLog
lisp/vc/ediff.el

index d7b7bcc..cdedd88 100644 (file)
@@ -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.
 
index aba23b0..4a4aab7 100644 (file)
@@ -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)))