# HG changeset patch
# User Michael Kifer <kifer@cs.stonybrook.edu>
# Date 813640479 0
# Node ID c3f879af05db064f006e6fa3158ff8531bddbbe6
# Parent  b9dc8cc658d5e8ea0a8d06a1c653db89056e8c5d
(ediff-version): is now autoloaded.

diff -r b9dc8cc658d5 -r c3f879af05db lisp/ediff.el
--- a/lisp/ediff.el	Sat Oct 14 03:14:11 1995 +0000
+++ b/lisp/ediff.el	Sat Oct 14 03:14:39 1995 +0000
@@ -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 @@
       (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)