summaryrefslogtreecommitdiff
path: root/lisp/gnus
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/gnus')
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/message.el2
-rw-r--r--lisp/gnus/sieve.el18
3 files changed, 16 insertions, 10 deletions
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."