Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
138df2ce
Commit
138df2ce
authored
Oct 14, 1995
by
Michael Kifer
Browse files
(ediff-version): is now autoloaded.
parent
009650b3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
+11
-2
lisp/ediff.el
lisp/ediff.el
+11
-2
No files found.
lisp/ediff.el
View file @
138df2ce
...
...
@@ -5,8 +5,8 @@
;; Created: February 2, 1994
;; Keywords: comparing, merging, patching, version control.
(
defconst
ediff-version
"2.4
6
"
"The current version of Ediff"
)
(
defconst
ediff-date
"
Septem
ber
28
, 1995"
"Date of last update"
)
(
defconst
ediff-version
"2.4
7
"
"The current version of Ediff"
)
(
defconst
ediff-date
"
Octo
ber
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment