Remove some compat code from viper-*.el

* lisp/emulation/viper-util.el (viper-check-minibuffer-overlay):
* lisp/emulation/viper-cmd.el (viper-minibuffer-standard-hook)
(viper-minibuffer-real-start, viper-submit-report): No need to
check whether minibuffer-prompt-end is defined.

diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 5518af4997d6b9b28449ade8fe29dfb95ec2a1f1..9ae7523b432bd488eb14057b63f053d1c38cd10e 100644 (file)
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -1886,15 +1886,11 @@ Undo previous insertion and inserts new."
     (or unread-command-events
        executing-kbd-macro
        (sit-for 840))
-    (if (fboundp 'minibuffer-prompt-end)
-       (delete-region (minibuffer-prompt-end) (point-max))
-      (erase-buffer))
+    (delete-region (minibuffer-prompt-end) (point-max))
     (insert viper-initial)))
 
 (defsubst viper-minibuffer-real-start ()
-  (if (fboundp 'minibuffer-prompt-end)
-      (minibuffer-prompt-end)
-    (point-min)))
+  (minibuffer-prompt-end))
 
 (defun viper-minibuffer-post-command-hook()
   (when (active-minibuffer-window)
@@ -4738,8 +4734,7 @@ Please, specify your level now: "))
        (viper-color-display-p (if (viper-window-display-p)
                              (viper-color-display-p)
                               'non-x))
-        (viper-frame-parameters (if (fboundp 'frame-parameters)
-                                    (frame-parameters (selected-frame))))
+        (viper-frame-parameters (frame-parameters (selected-frame)))
        (viper-minibuffer-emacs-face (if (viper-has-face-support-p)
                                          (facep
                                           viper-minibuffer-emacs-face)

diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 61bc26614eba27b02cd9fc7f16c3be4cc833bd87..83e45e1cd0cb73653c60894c0f4944cb95a43235 100644 (file)
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -786,14 +786,11 @@ Otherwise return the normal value."
 (defun viper-check-minibuffer-overlay ()
   (if (overlayp viper-minibuffer-overlay)
       (move-overlay
-       viper-minibuffer-overlay
-       (if (fboundp 'minibuffer-prompt-end) (minibuffer-prompt-end) 1)
-       (1+ (buffer-size)))
+       viper-minibuffer-overlay (minibuffer-prompt-end) (1+ (buffer-size)))
     (setq viper-minibuffer-overlay
          ;; make overlay open-ended
          (make-overlay
-          (if (fboundp 'minibuffer-prompt-end) (minibuffer-prompt-end) 1)
-          (1+ (buffer-size))
+          (minibuffer-prompt-end) (1+ (buffer-size))
           (current-buffer) nil 'rear-advance))))