[Emacs-diffs] /srv/bzr/emacs/trunk r112663: * lisp/vc/ediff.el (ediff-version): Use called-interactively-p on Emacs.

[Glenn Morris]

------------------------------------------------------------
revno: 112663
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-05-21 20:17:22 -0700
message:
  * lisp/vc/ediff.el (ediff-version): Use called-interactively-p on Emacs.
modified:
  lisp/ChangeLog
  lisp/vc/ediff.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-22 03:16:05 +0000
+++ b/lisp/ChangeLog    2013-05-22 03:17:22 +0000
@@ -1,5 +1,7 @@
 2013-05-22  Glenn Morris  <address@hidden>
 
+       * vc/ediff.el (ediff-version): Use called-interactively-p on Emacs.
+
        * progmodes/idlw-help.el (idlwave-help-fontify):
        Use called-interactively-p.
 

=== modified file 'lisp/vc/ediff.el'
--- a/lisp/vc/ediff.el  2013-01-01 09:11:05 +0000
+++ b/lisp/vc/ediff.el  2013-05-22 03:17:22 +0000
@@ -1464,9 +1464,9 @@
   "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)))