Mercurial > emacs

changeset 87941:d77b6e5ee8af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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.
author Dan Nicolaescu <dann@ics.uci.edu>
date Thu, 24 Jan 2008 15:14:52 +0000
parents 657fb7a7fe8e
children d497b71f87dc
files lisp/ChangeLog lisp/ansi-color.el lisp/emulation/crisp.el lisp/emulation/tpu-edt.el lisp/gnus/ChangeLog lisp/gnus/message.el lisp/gnus/sieve.el lisp/progmodes/f90.el lisp/progmodes/pascal.el lisp/progmodes/vhdl-mode.el lisp/textmodes/ispell.el lisp/textmodes/reftex-index.el lisp/textmodes/reftex-toc.el lisp/winner.el
diffstat 14 files changed, 56 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Jan 24 15:09:24 2008 +0000
+++ b/lisp/ChangeLog	Thu Jan 24 15:14:52 2008 +0000
@@ -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
--- a/lisp/ansi-color.el	Thu Jan 24 15:09:24 2008 +0000
+++ b/lisp/ansi-color.el	Thu Jan 24 15:14:52 2008 +0000
@@ -513,7 +513,7 @@
 (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)))
 
--- a/lisp/emulation/crisp.el	Thu Jan 24 15:09:24 2008 +0000
+++ b/lisp/emulation/crisp.el	Thu Jan 24 15:14:52 2008 +0000
@@ -148,7 +148,7 @@
 
 (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))
 
--- a/lisp/emulation/tpu-edt.el	Thu Jan 24 15:09:24 2008 +0000
+++ b/lisp/emulation/tpu-edt.el	Thu Jan 24 15:14:52 2008 +0000
@@ -751,9 +751,7 @@
 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."
--- a/lisp/gnus/ChangeLog	Thu Jan 24 15:09:24 2008 +0000
+++ b/lisp/gnus/ChangeLog	Thu Jan 24 15:14:52 2008 +0000
@@ -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.
--- a/lisp/gnus/message.el	Thu Jan 24 15:09:24 2008 +0000
+++ b/lisp/gnus/message.el	Thu Jan 24 15:14:52 2008 +0000
@@ -5952,7 +5952,7 @@
 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))
--- a/lisp/gnus/sieve.el	Thu Jan 24 15:09:24 2008 +0000
+++ b/lisp/gnus/sieve.el	Thu Jan 24 15:14:52 2008 +0000
@@ -290,15 +290,15 @@
   (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."
--- a/lisp/progmodes/f90.el	Thu Jan 24 15:09:24 2008 +0000
+++ b/lisp/progmodes/f90.el	Thu Jan 24 15:14:52 2008 +0000
@@ -1681,7 +1681,7 @@
     (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 @@
     (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 @@
             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))))
 
--- a/lisp/progmodes/pascal.el	Thu Jan 24 15:09:24 2008 +0000
+++ b/lisp/progmodes/pascal.el	Thu Jan 24 15:14:52 2008 +0000
@@ -523,8 +523,8 @@
   (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.
--- a/lisp/progmodes/vhdl-mode.el	Thu Jan 24 15:09:24 2008 +0000
+++ b/lisp/progmodes/vhdl-mode.el	Thu Jan 24 15:14:52 2008 +0000
@@ -2047,7 +2047,7 @@
 (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
--- a/lisp/textmodes/ispell.el	Thu Jan 24 15:09:24 2008 +0000
+++ b/lisp/textmodes/ispell.el	Thu Jan 24 15:14:52 2008 +0000
@@ -1627,7 +1627,7 @@
 	     (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 @@
 		 (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)))))
--- a/lisp/textmodes/reftex-index.el	Thu Jan 24 15:09:24 2008 +0000
+++ b/lisp/textmodes/reftex-index.el	Thu Jan 24 15:14:52 2008 +0000
@@ -1243,8 +1243,9 @@
           (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 @@
       (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))
--- a/lisp/textmodes/reftex-toc.el	Thu Jan 24 15:09:24 2008 +0000
+++ b/lisp/textmodes/reftex-toc.el	Thu Jan 24 15:14:52 2008 +0000
@@ -326,7 +326,7 @@
 (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 @@
 (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 @@
   (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)))))
--- a/lisp/winner.el	Thu Jan 24 15:09:24 2008 +0000
+++ b/lisp/winner.el	Thu Jan 24 15:14:52 2008 +0000
@@ -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)))