diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ediff-init.el | 25 | ||||
| -rw-r--r-- | lisp/emulation/viper-util.el | 24 |
2 files changed, 0 insertions, 49 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.") (cond ((memq op '(= > >=)) nil) ((memq op '(< <=)) t)))) - -;; warn if it is a wrong emacs -(if (or (ediff-check-version '< 19 29 'emacs) - (ediff-check-version '< 19 12 'xemacs)) - (progn - (with-output-to-temp-buffer ediff-msg-buffer - (switch-to-buffer ediff-msg-buffer) - (insert - (format " - -This version of Ediff requires - -\t Emacs 19.29 and higher -\t OR -\t XEmacs 19.12 and higher - -It is unlikely to work under Emacs version %s -that you are using... - -Type any key to continue..." emacs-version)) - (beep 1) - (beep 1) - (ediff-read-event)) - (kill-buffer ediff-msg-buffer))) - ;; A fix for NeXT Step ;; Should probably be eliminated in later versions. (if (and (ediff-window-display-p) (eq (ediff-device-type) 'ns)) diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index 36d7d54c996..31233a6f0da 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -219,30 +219,6 @@ (error "%S: Invalid op in vip-check-version" op)))) (cond ((memq op '(= > >=)) nil) ((memq op '(< <=)) t)))) - -;; warn if it is a wrong emacs -(if (or (vip-check-version '< 19 29 'emacs) - (vip-check-version '< 19 12 'xemacs)) - (progn - (with-output-to-temp-buffer " *vip-info*" - (switch-to-buffer " *vip-info*") - (insert - (format " - -This version of Viper requires - -\t Emacs 19.29 and higher -\t OR -\t XEmacs 19.12 and higher - -It is unlikely to work under Emacs version %s -that you are using... - -Type any key to continue..." emacs-version)) - (beep 1) - (beep 1) - (vip-read-event)) - (kill-buffer " *vip-info*"))) (defun vip-get-visible-buffer-window (wind) |