diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-05-21 20:17:22 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-05-21 20:17:22 -0700 |
| commit | 5f70c1698a43722accd94179bf61e197fe057a55 (patch) | |
| tree | 024ef530ae57984c8b63167ed822f65d65d345bc /lisp/vc/ediff.el | |
| parent | b1b7f300fa77d838cfdf47bfc65bfd1c5808d966 (diff) | |
| download | emacs-5f70c1698a43722accd94179bf61e197fe057a55.tar.gz | |
* lisp/vc/ediff.el (ediff-version): Use called-interactively-p on Emacs.
Diffstat (limited to 'lisp/vc/ediff.el')
| -rw-r--r-- | lisp/vc/ediff.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index aba23b06535..4a4aab75144 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))) |