Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 1011, 1016)

   - Update from CVS
   - Merge from gnus--devo--0

2008-01-24    Michael Sperber  <sperber@deinprogramm.de>

   * lisp/mail-source.el (mail-sources): Add `group' choice.

   * lisp/nnmail.el (nnmail-get-new-mail-1): Abstract this out to add another
   parameter `in-group' to control into which group the articles go.
   Add treatment of `group' mail-source.

2008-01-24  Dan Nicolaescu  <dann@ics.uci.edu>

   * lisp/sieve.el (sieve-make-overlay, sieve-overlay-put, sieve-overlays-at):
   * lisp/message.el (message-beginning-of-line): Use featurep instead of bound
   tests in order to resolve conditionals at compile time.

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-449

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5dc38e5..222825c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 2008-01-24    Michael Sperber  <sperber@deinprogramm.de>
 
        * mail-source.el (mail-sources): Add `group' choice.
@@ -6,6 +7,22 @@
        parameter `in-group' to control into which group the articles go.
        Add treatment of `group' mail-source.
 
+=======
+2008-01-24    Michael Sperber  <sperber@deinprogramm.de>
+
+       * mail-source.el (mail-sources): Add `group' choice.
+
+       * nnmail.el (nnmail-get-new-mail-1): Abstract this out to add another
+       parameter `in-group' to control into which group the articles go.
+       Add treatment of `group' mail-source.
+
+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.
+
+>>>>>>> MERGE-SOURCE
 2008-01-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-insert-mime-button): Don't decode description.

diff --git a/lisp/message.el b/lisp/message.el
index 731d992..273d1c4 100644 (file)
--- a/lisp/message.el
+++ b/lisp/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/sieve.el b/lisp/sieve.el
index c05e9d1..c32c44a 100644 (file)
--- a/lisp/sieve.el
+++ b/lisp/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."