diff options
| author | Richard M. Stallman | 1994-08-04 08:22:09 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-08-04 08:22:09 +0000 |
| commit | 7c496a7928ef7eb69064aad20d9729c6c77c12e9 (patch) | |
| tree | b8c07e5421b038683ee04fd2e39cacc85b6470cb | |
| parent | 9c197f24a18bb196618e7022522c155d53ae6f07 (diff) | |
| download | emacs-7c496a7928ef7eb69064aad20d9729c6c77c12e9.tar.gz emacs-7c496a7928ef7eb69064aad20d9729c6c77c12e9.zip | |
(ediff-version): Function, variable deleted.
(ediff-date): Var deleted.
(ediff-status-info): Don't call ediff-version.
| -rw-r--r-- | lisp/ediff.el | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el index a10c11f61de..b8d48a2bd95 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el | |||
| @@ -3,7 +3,7 @@ | |||
| 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 | ;; Version: 1.64.2 | 6 | ;; Version of last Kifer changes: 1.64.2 |
| 7 | ;; Keywords: comparing, merging, patching, version control. | 7 | ;; Keywords: comparing, merging, patching, version control. |
| 8 | 8 | ||
| 9 | ;; This file is part of GNU Emacs. | 9 | ;; This file is part of GNU Emacs. |
| @@ -1029,19 +1029,6 @@ Commands: | |||
| 1029 | (setq major-mode 'ediff-mode) | 1029 | (setq major-mode 'ediff-mode) |
| 1030 | (setq mode-name "Ediff")) | 1030 | (setq mode-name "Ediff")) |
| 1031 | 1031 | ||
| 1032 | (defvar ediff-version "1.64" | ||
| 1033 | "The current version of Ediff.") | ||
| 1034 | (defvar ediff-date "June 28, 1994" | ||
| 1035 | "Date of last update.") | ||
| 1036 | |||
| 1037 | (defun ediff-version () | ||
| 1038 | "Return string describing the version of Ediff. | ||
| 1039 | When called interactively, displays the version." | ||
| 1040 | (interactive) | ||
| 1041 | (if (interactive-p) | ||
| 1042 | (message "Ediff version %s" (ediff-version)) | ||
| 1043 | ediff-version)) | ||
| 1044 | |||
| 1045 | 1032 | ||
| 1046 | ;; Hook variables | 1033 | ;; Hook variables |
| 1047 | 1034 | ||
| @@ -3408,8 +3395,6 @@ up an appropriate window config." | |||
| 3408 | Hit \\[ediff-recenter] to reset the windows afterward." | 3395 | Hit \\[ediff-recenter] to reset the windows afterward." |
| 3409 | (interactive) | 3396 | (interactive) |
| 3410 | (with-output-to-temp-buffer " *ediff-info*" | 3397 | (with-output-to-temp-buffer " *ediff-info*" |
| 3411 | (princ (format "Ediff version: %s of %s\n\n" | ||
| 3412 | ediff-version ediff-date)) | ||
| 3413 | (ediff-eval-in-buffer ediff-A-buffer | 3398 | (ediff-eval-in-buffer ediff-A-buffer |
| 3414 | (if buffer-file-name | 3399 | (if buffer-file-name |
| 3415 | (princ | 3400 | (princ |