aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ediff-init.el25
-rw-r--r--lisp/emulation/viper-util.el24
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.")
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
620This version of Ediff requires
621
622\t Emacs 19.29 and higher
623\t OR
624\t XEmacs 19.12 and higher
625
626It is unlikely to work under Emacs version %s
627that you are using...
628
629Type 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))
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 @@
219 (error "%S: Invalid op in vip-check-version" op)))) 219 (error "%S: Invalid op in vip-check-version" op))))
220 (cond ((memq op '(= > >=)) nil) 220 (cond ((memq op '(= > >=)) nil)
221 ((memq op '(< <=)) t)))) 221 ((memq op '(< <=)) t))))
222
223;; warn if it is a wrong emacs
224(if (or (vip-check-version '< 19 29 'emacs)
225 (vip-check-version '< 19 12 'xemacs))
226 (progn
227 (with-output-to-temp-buffer " *vip-info*"
228 (switch-to-buffer " *vip-info*")
229 (insert
230 (format "
231
232This version of Viper requires
233
234\t Emacs 19.29 and higher
235\t OR
236\t XEmacs 19.12 and higher
237
238It is unlikely to work under Emacs version %s
239that you are using...
240
241Type any key to continue..." emacs-version))
242 (beep 1)
243 (beep 1)
244 (vip-read-event))
245 (kill-buffer " *vip-info*")))
246 222
247 223
248(defun vip-get-visible-buffer-window (wind) 224(defun vip-get-visible-buffer-window (wind)