summaryrefslogtreecommitdiff
path: root/lisp/ediff.el
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2009-10-02 03:48:36 +0000
committerJuanma Barranquero <lekktu@gmail.com>2009-10-02 03:48:36 +0000
commit32226619c5e563c384372b566000e5d37d783a61 (patch)
tree216af4221d2ba868b45162679ce3a0462985c422 /lisp/ediff.el
parent12a3c28c787e23801f40ea557a5c00b538968a52 (diff)
downloademacs-32226619c5e563c384372b566000e5d37d783a61.tar.gz
Use `called-interactively-p' instead of `interactive-p'.
Diffstat (limited to 'lisp/ediff.el')
-rw-r--r--lisp/ediff.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el
index 6243c040e2c..5c53d1a6688 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -1453,7 +1453,7 @@ 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)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "%s" (ediff-version))
(format "Ediff %s of %s" ediff-version ediff-date)))