summaryrefslogtreecommitdiff
path: root/lisp/ediff.el
diff options
context:
space:
mode:
authorMichael Kifer <kifer@cs.stonybrook.edu>1995-10-14 03:14:39 +0000
committerMichael Kifer <kifer@cs.stonybrook.edu>1995-10-14 03:14:39 +0000
commit7bc44e7f1d35ba447da6964c2448d41151076f49 (patch)
tree21ef676b7ac2d603306989b22f85f52e28a06e23 /lisp/ediff.el
parent89aa4b2297fba1c22f1c2d95b3b8715d810ae0a8 (diff)
downloademacs-7bc44e7f1d35ba447da6964c2448d41151076f49.tar.gz
(ediff-version): is now autoloaded.
Diffstat (limited to 'lisp/ediff.el')
-rw-r--r--lisp/ediff.el13
1 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el
index d0a41a33be9..3bdce5c177a 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -5,8 +5,8 @@
;; Created: February 2, 1994
;; Keywords: comparing, merging, patching, version control.
-(defconst ediff-version "2.46" "The current version of Ediff")
-(defconst ediff-date "September 28, 1995" "Date of last update")
+(defconst ediff-version "2.47" "The current version of Ediff")
+(defconst ediff-date "October 11, 1995" "Date of last update")
;; This file is part of GNU Emacs.
@@ -1483,6 +1483,15 @@ If `F.~REV~' already exists, it is used instead of being re-created."
(setq rev2buf (current-buffer)))
(ediff-buffers rev1buf rev2buf startup-hooks 'ediff-revision)))
+;;;###autoload
+(defun ediff-version ()
+ "Return string describing the version of Ediff.
+When called interactively, displays the version."
+ (interactive)
+ (if (interactive-p)
+ (message (ediff-version))
+ (format "Ediff %s of %s" ediff-version ediff-date)))
+
(provide 'ediff)
(require 'ediff-util)