3 files changed, 16 insertions, 10 deletions
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index fbebacb16b5..68116cde092 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -47,6 +47,9 @@
 (defvar initial)
 (defvar undo-beg-posn)
 (defvar undo-end-posn)
+
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
 ;; end pacifier
 
 
@@ -3083,10 +3086,9 @@ On reaching beginning of line, stop and signal error."
     (setq this-command 'next-line)
     (if com (viper-execute-com 'viper-next-line val com))))
 
-;; declare-function is not defined in XEmacs
-;;(declare-function widget-type "wid-edit" (widget))
-;;(declare-function widget-button-press "wid-edit" (pos &optional event))
-;;(declare-function viper-set-hooks "viper" ())
+(declare-function widget-type "wid-edit" (widget))
+(declare-function widget-button-press "wid-edit" (pos &optional event))
+(declare-function viper-set-hooks "viper" ())
 
 (defun viper-next-line-at-bol (arg)
   "Next line at beginning of line.
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index 02df3fe3084..05c90f995ab 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -33,14 +33,16 @@
 (defvar viper-expert-level)
 (defvar viper-ex-style-editing)
 (defvar viper-ex-style-motion)
+
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
 ;; end pacifier
 
 (require 'viper-util)
 
-;; declare-function is not defined in XEmacs
-;;(declare-function viper-ex "viper-ex" (arg &optional string))
-;;(declare-function viper-normalize-minor-mode-map-alist "viper-cmd" ())
-;;(declare-function viper-set-mode-vars-for "viper-cmd" (state))
+(declare-function viper-ex "viper-ex" (arg &optional string))
+(declare-function viper-normalize-minor-mode-map-alist "viper-cmd" ())
+(declare-function viper-set-mode-vars-for "viper-cmd" (state))
 
 ;;; Variables
 
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 2bd2a3e276a..b838d8ce80e 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -44,6 +44,9 @@
 
 (require 'ring)
 
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
+
 ;; end pacifier
 
 (require 'viper-init)
@@ -374,8 +377,7 @@
 
 
 
-;; declare-function is not defined in XEmacs
-;;(declare-function viper-forward-Word "viper-cmd" (arg))
+(declare-function viper-forward-Word "viper-cmd" (arg))
 
 ;;; Support for :e, :r, :w file globbing