Changes committed gnus/lisp (ChangeLog message.el sieve.el)

Modified: ChangeLog message.el sieve.el

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  <[email protected]>

   * 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  <[email protected]>

   * 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: [email protected]/gnus--devo--0--patch-449


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1742 gnus/lisp/ChangeLog:7.1743
--- ChangeLog:7.1742	Thu Jan 24 23:16:33 2008
+++ ChangeLog	Mon Jan 28 10:02:57 2008
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 2008-01-24    Michael Sperber  <[email protected]>
 
 	* 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  <[email protected]>
+
+	* 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  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* gnus-art.el (gnus-insert-mime-button): Don't decode description.
Index: message.el
diff -u gnus/lisp/message.el:7.238 gnus/lisp/message.el:7.239
--- message.el:7.238	Sun Jan 20 06:23:57 2008
+++ message.el	Mon Jan 28 10:02:57 2008
@@ -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))
Index: sieve.el
diff -u gnus/lisp/sieve.el:7.13 gnus/lisp/sieve.el:7.14
--- sieve.el:7.13	Sun Jan 20 06:23:57 2008
+++ sieve.el	Mon Jan 28 10:02:57 2008
@@ -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."