diff options
| author | Richard M. Stallman | 1995-06-14 12:05:23 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-06-14 12:05:23 +0000 |
| commit | b35732e1e2d1f32c4e4bd3940ca07c1dc641d50f (patch) | |
| tree | 9b08d0b09e503a492c976045b2f7ee3ff69e6be1 /lisp/ediff-init.el | |
| parent | a15a76f76690fb3c9176c106419c62770b866ffc (diff) | |
| download | emacs-b35732e1e2d1f32c4e4bd3940ca07c1dc641d50f.tar.gz emacs-b35732e1e2d1f32c4e4bd3940ca07c1dc641d50f.zip | |
Delete the Emacs version error check.
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 69e9cc1e275..855227abc9b 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el | |||
| @@ -607,31 +607,6 @@ ediff-toggle-hilit. Use `setq-default' to set it.") | |||
| 607 | (cond ((memq op '(= > >=)) nil) | 607 | (cond ((memq op '(= > >=)) nil) |
| 608 | ((memq op '(< <=)) t)))) | 608 | ((memq op '(< <=)) t)))) |
| 609 | 609 | ||
| 610 | |||
| 611 | ;; warn if it is a wrong emacs | ||
| 612 | (if (or (ediff-check-version '< 19 29 'emacs) | ||
| 613 | (ediff-check-version '< 19 12 'xemacs)) | ||
| 614 | (progn | ||
| 615 | (with-output-to-temp-buffer ediff-msg-buffer | ||
| 616 | (switch-to-buffer ediff-msg-buffer) | ||
| 617 | (insert | ||
| 618 | (format " | ||
| 619 | |||
| 620 | This version of Ediff requires | ||
| 621 | |||
| 622 | \t Emacs 19.29 and higher | ||
| 623 | \t OR | ||
| 624 | \t XEmacs 19.12 and higher | ||
| 625 | |||
| 626 | It is unlikely to work under Emacs version %s | ||
| 627 | that you are using... | ||
| 628 | |||
| 629 | Type any key to continue..." emacs-version)) | ||
| 630 | (beep 1) | ||
| 631 | (beep 1) | ||
| 632 | (ediff-read-event)) | ||
| 633 | (kill-buffer ediff-msg-buffer))) | ||
| 634 | |||
| 635 | ;; A fix for NeXT Step | 610 | ;; A fix for NeXT Step |
| 636 | ;; Should probably be eliminated in later versions. | 611 | ;; Should probably be eliminated in later versions. |
| 637 | (if (and (ediff-window-display-p) (eq (ediff-device-type) 'ns)) | 612 | (if (and (ediff-window-display-p) (eq (ediff-device-type) 'ns)) |