comparison lisp/ediff.el @ 13217:c3f879af05db

(ediff-version): is now autoloaded.
author Michael Kifer <kifer@cs.stonybrook.edu>
date Sat, 14 Oct 1995 03:14:39 +0000
parents 0e069b2940ae
children 81099f6b6fb1
comparison
equal deleted inserted replaced
13216:b9dc8cc658d5 13217:c3f879af05db
3 3
4 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> 4 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
5 ;; Created: February 2, 1994 5 ;; Created: February 2, 1994
6 ;; Keywords: comparing, merging, patching, version control. 6 ;; Keywords: comparing, merging, patching, version control.
7 7
8 (defconst ediff-version "2.46" "The current version of Ediff") 8 (defconst ediff-version "2.47" "The current version of Ediff")
9 (defconst ediff-date "September 28, 1995" "Date of last update") 9 (defconst ediff-date "October 11, 1995" "Date of last update")
10 10
11 ;; This file is part of GNU Emacs. 11 ;; This file is part of GNU Emacs.
12 12
13 ;; GNU Emacs is free software; you can redistribute it and/or modify 13 ;; GNU Emacs is free software; you can redistribute it and/or modify
14 ;; it under the terms of the GNU General Public License as published by 14 ;; it under the terms of the GNU General Public License as published by
1481 (or (string= rev2 "") ; use current buffer 1481 (or (string= rev2 "") ; use current buffer
1482 (sc-visit-previous-revision rev2)) 1482 (sc-visit-previous-revision rev2))
1483 (setq rev2buf (current-buffer))) 1483 (setq rev2buf (current-buffer)))
1484 (ediff-buffers rev1buf rev2buf startup-hooks 'ediff-revision))) 1484 (ediff-buffers rev1buf rev2buf startup-hooks 'ediff-revision)))
1485 1485
1486 ;;;###autoload
1487 (defun ediff-version ()
1488 "Return string describing the version of Ediff.
1489 When called interactively, displays the version."
1490 (interactive)
1491 (if (interactive-p)
1492 (message (ediff-version))
1493 (format "Ediff %s of %s" ediff-version ediff-date)))
1494
1486 1495
1487 (provide 'ediff) 1496 (provide 'ediff)
1488 (require 'ediff-util) 1497 (require 'ediff-util)
1489 1498
1490 ;;; ediff.el ends here 1499 ;;; ediff.el ends here