summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lisp/ChangeLog17
-rw-r--r--lisp/ansi-color.el2
-rw-r--r--lisp/emulation/crisp.el2
-rw-r--r--lisp/emulation/tpu-edt.el4
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/message.el2
-rw-r--r--lisp/gnus/sieve.el18
-rw-r--r--lisp/progmodes/f90.el6
-rw-r--r--lisp/progmodes/pascal.el4
-rw-r--r--lisp/progmodes/vhdl-mode.el2
-rw-r--r--lisp/textmodes/ispell.el4
-rw-r--r--lisp/textmodes/reftex-index.el10
-rw-r--r--lisp/textmodes/reftex-toc.el10
-rw-r--r--lisp/winner.el2
14 files changed, 56 insertions, 33 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 18baed67097..cb0e6acecdf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2008-01-24 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * 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.
+
2008-01-24 Juanma Barranquero <lekktu@gmail.com>
* delsel.el (delsel-unload-function): Don't use `remprop'; it is
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 530325cd24e..db2818f31ed 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -513,7 +513,7 @@ property."
(defun ansi-color-set-extent-face (extent face)
"Set the `face' property of EXTENT to FACE.
XEmacs uses `set-extent-face', Emacs uses `overlay-put'."
- (if (fboundp 'set-extent-face)
+ (if (featurep 'xemacs)
(set-extent-face extent face)
(overlay-put extent 'face face)))
diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el
index b5fd7ee602c..7c254da869a 100644
--- a/lisp/emulation/crisp.el
+++ b/lisp/emulation/crisp.el
@@ -148,7 +148,7 @@ does not load the scroll-all package."
(defun crisp-region-active ()
"Compatibility function to test for an active region."
- (if (boundp 'zmacs-region-active-p)
+ (if (featurep 'xemacs)
zmacs-region-active-p
mark-active))
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index ff0e6ad25eb..e9de0409aa4 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -751,9 +751,7 @@ version of Emacs."
Sets the mark at POS and activates the region according to the
current version of Emacs."
(set-mark pos)
- ;; We use a separate `if' for the fboundp so the byte-compiler notices it
- ;; and doesn't complain about the subsequent call.
- (if (fboundp 'zmacs-activate-region) (if pos (zmacs-activate-region))))
+ (when (featurep 'xemacs) (when pos (zmacs-activate-region))))
(defun tpu-string-prompt (prompt history-symbol)
"Read a string with PROMPT."
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index dbba5fd608e..35347c8e71a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-24 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * 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.
+
2008-01-23 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (gnus-insert-mime-button): Don't decode description.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 731d9924286..273d1c4ec5b 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5952,7 +5952,7 @@ beginning of header value. Therefore, repeated calls will toggle point
between beginning of field and beginning of line."
(interactive "p")
(let ((zrs 'zmacs-region-stays))
- (when (and (interactive-p) (boundp zrs))
+ (when (and (featurep 'xemacs) (interactive-p) (boundp zrs))
(set zrs t)))
(if (and message-beginning-of-line
(message-point-in-header-p))
diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el
index c05e9d1a356..c32c44ae505 100644
--- a/lisp/gnus/sieve.el
+++ b/lisp/gnus/sieve.el
@@ -290,15 +290,15 @@ Server : " server ":" (or port "2000") "
(get-char-property (or pos (point)) 'script-name))
(eval-and-compile
- (defalias 'sieve-make-overlay (if (fboundp 'make-overlay)
- 'make-overlay
- 'make-extent))
- (defalias 'sieve-overlay-put (if (fboundp 'overlay-put)
- 'overlay-put
- 'set-extent-property))
- (defalias 'sieve-overlays-at (if (fboundp 'overlays-at)
- 'overlays-at
- 'extents-at)))
+ (defalias 'sieve-make-overlay (if (featurep 'xemacs)
+ 'make-extent
+ 'make-overlay))
+ (defalias 'sieve-overlay-put (if (featurep 'xemacs)
+ 'set-extent-property
+ 'overlay-put))
+ (defalias 'sieve-overlays-at (if (featurep 'xemacs)
+ 'extents-at
+ 'overlays-at)))
(defun sieve-highlight (on)
"Turn ON or off highlighting on the current language overlay."
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index df10b5ecd30..2c152d91512 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1681,7 +1681,7 @@ A block is a subroutine, if-endif, etc."
(push-mark)
(goto-char pos)
(setq program (f90-beginning-of-subprogram))
- (if (fboundp 'zmacs-activate-region)
+ (if (featurep 'xemacs)
(zmacs-activate-region)
(setq mark-active t
deactivate-mark nil))
@@ -1866,7 +1866,7 @@ If run in the middle of a line, the line is not broken."
(goto-char save-point)
(set-marker end-region-mark nil)
(set-marker save-point nil)
- (if (fboundp 'zmacs-deactivate-region)
+ (if (featurep 'xemacs)
(zmacs-deactivate-region)
(deactivate-mark))))
@@ -1976,7 +1976,7 @@ Like `join-line', but handles F90 syntax."
f90-cache-position (point)))
(setq f90-cache-position nil)
(set-marker end-region-mark nil)
- (if (fboundp 'zmacs-deactivate-region)
+ (if (featurep 'xemacs)
(zmacs-deactivate-region)
(deactivate-mark))))
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index 6dca919ba25..4c33b6b053c 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -523,8 +523,8 @@ This puts the mark at the end, and point at the beginning."
(pascal-end-of-defun)
(push-mark (point))
(pascal-beg-of-defun)
- (if (fboundp 'zmacs-activate-region)
- (zmacs-activate-region)))
+ (when (featurep 'xemacs)
+ (zmacs-activate-region)))
(defun pascal-comment-area (start end)
"Put the region into a Pascal comment.
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 98818ea8354..72fda808053 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -2047,7 +2047,7 @@ your style, only those that are different from the default.")
(defun vhdl-keep-region-active ()
"Do whatever is necessary to keep the region active in XEmacs.
Ignore byte-compiler warnings you might see."
- (and (boundp 'zmacs-region-stays)
+ (and (featurep 'xemacs)
(setq zmacs-region-stays t)))
;; `wildcard-to-regexp' is included only in XEmacs 21
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 813b26ee6e4..fcb1d2444ec 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 2d489eb5896..15fba461fd3 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 0e501fdf23e..e57e9a59a73 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)))))
diff --git a/lisp/winner.el b/lisp/winner.el
index 27b68106a53..5e9d6a3212e 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -51,7 +51,7 @@
'(region-active-p)))
(defsetf winner-active-region () (store)
- (if (fboundp 'zmacs-activate-region)
+ (if (featurep 'xemacs)
`(if ,store (zmacs-activate-region)
(zmacs-deactivate-region))
`(setq mark-active ,store)))
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-19 03:29:39 +0000