* sieve.el (sieve-make-overlay, sieve-overlay-put, sieve-overlays-at):

* message.el (message-beginning-of-line): Use featurep instead of bound
tests in order to resolve conditionals at compile time.

* textmodes/reftex-toc.el (reftex-toc-next, reftex-toc-previous)
(reftex-toc-restore-region):
* textmodes/reftex-index.el (reftex-index-initialize-phrases-buffer)
(reftex-index-phrases-apply-to-region):
* textmodes/ispell.el (ispell-word):
* progmodes/vhdl-mode.el (vhdl-keep-region-active):
* progmodes/pascal.el (pascal-mark-defun):
* progmodes/f90.el (f90-mark-subprogram, f90-indent-region)
(f90-fill-region):
* emulation/tpu-edt.el (tpu-set-mark):
* emulation/crisp.el (crisp-region-active):
* winner.el (winner-active-region):
* ansi-color.el (ansi-color-set-extent-face): Use featurep instead
of bound tests in order to resolve conditionals at compile time.

3 files changed, 13 insertions, 11 deletions

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 813b26ee6e..fcb1d2444e 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1627,7 +1627,7 @@ quit          spell session exited."
 	     (or quietly
 		 (message "%s is correct"
 			  (funcall ispell-format-word-function word)))
-	     (and (fboundp 'extent-at)
+	     (and (featurep 'xemacs)
 		  (extent-at start)
 		  (and (fboundp 'delete-extent)
 		       (delete-extent (extent-at start)))))
@@ -1636,7 +1636,7 @@ quit          spell session exited."
 		 (message "%s is correct because of root %s"
 			  (funcall ispell-format-word-function word)
 			  (funcall ispell-format-word-function poss)))
-	     (and (fboundp 'extent-at)
+	     (and (featurep 'xemacs)
 		  (extent-at start)
 		  (and (fboundp 'delete-extent)
 		       (delete-extent (extent-at start)))))
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 2d489eb589..15fba461fd 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -1243,8 +1243,9 @@ If the buffer is non-empty, delete the old header first."
           (beginning-of-line 2))
       (while (looking-at "^[ \t]*$")
           (beginning-of-line 2))          
-      (cond ((fboundp 'zmacs-activate-region) (zmacs-activate-region))
-            ((boundp 'make-active) (setq mark-active t)))
+      (if (featurep 'xemacs) 
+	  (zmacs-activate-region)
+	(setq mark-active t))
       (if (yes-or-no-p "Delete and rebuild header? ")
           (delete-region (point-min) (point))))
 
@@ -1495,8 +1496,9 @@ index the new part without having to go over the unchanged parts again."
       (unwind-protect
           (progn
             ;; Hide the region highlighting
-            (cond ((fboundp 'zmacs-deactivate-region) (zmacs-deactivate-region))
-                  ((fboundp 'deactivate-mark) (deactivate-mark)))
+            (if (featurep 'xemacs)
+		(zmacs-deactivate-region)
+	      (deactivate-mark))
             (delete-other-windows)
             (reftex-index-visit-phrases-buffer)
             (reftex-index-all-phrases))
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index 0e501fdf23..e57e9a59a7 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -326,7 +326,7 @@ SPC=view TAB=goto RET=goto+hide [q]uit [r]escan [l]abels [f]ollow [x]r [?]Help
 (defun reftex-toc-next (&optional arg)
   "Move to next selectable item."
   (interactive "p")
-  (if (boundp 'zmacs-region-stays) (setq zmacs-region-stays t))
+  (when (featurep 'xemacs) (setq zmacs-region-stays t))
   (setq reftex-callback-fwd t)
   (or (eobp) (forward-char 1))
   (goto-char (or (next-single-property-change (point) :data) 
@@ -334,21 +334,21 @@ SPC=view TAB=goto RET=goto+hide [q]uit [r]escan [l]abels [f]ollow [x]r [?]Help
 (defun reftex-toc-previous (&optional arg)
   "Move to previous selectable item."
   (interactive "p")
-  (if (boundp 'zmacs-region-stays) (setq zmacs-region-stays t))
+  (when (featurep 'xemacs) (setq zmacs-region-stays t))
   (setq reftex-callback-fwd nil)
   (goto-char (or (previous-single-property-change (point) :data)
                  (point))))
 (defun reftex-toc-next-heading (&optional arg)
   "Move to next table of contentes line."
   (interactive "p")
-  (if (boundp 'zmacs-region-stays) (setq zmacs-region-stays t))
+  (when (featurep 'xemacs) (setq zmacs-region-stays t))
   (end-of-line)
   (re-search-forward "^ " nil t arg)
   (beginning-of-line))
 (defun reftex-toc-previous-heading (&optional arg)
   "Move to previous table of contentes line."
   (interactive "p")
-  (if (boundp 'zmacs-region-stays) (setq zmacs-region-stays t))
+  (when (featurep 'xemacs) (setq zmacs-region-stays t))
   (re-search-backward "^ " nil t arg))
 (defun reftex-toc-toggle-follow ()
   "Toggle follow (other window follows with context)."
@@ -637,7 +637,7 @@ point."
   (if mark-line
       (progn
         (set-mark mpos)
-        (if (fboundp 'zmacs-activate-region)
+        (if (featurep 'xemacs)
             (zmacs-activate-region)
           (setq mark-active t
                 deactivate-mark nil)))))