Changes committed gnus/lisp (ChangeLog)
"Reiner Steib" <[email protected]>
| Newsgroups | gmane.emacs.gnus.commits |
|---|---|
| Message-ID | <[email protected]> |
Modified: ChangeLog Fix merge from Emacs. Index: ChangeLog diff -u gnus/lisp/ChangeLog:7.1743 gnus/lisp/ChangeLog:7.1744 --- ChangeLog:7.1743 Mon Jan 28 10:02:57 2008 +++ ChangeLog Mon Jan 28 19:48:47 2008 @@ -1,14 +1,10 @@ -<<<<<<< TREE -2008-01-24 Michael Sperber <[email protected]> +2008-01-28 Dan Nicolaescu <[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. + * 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-24 Michael Sperber <[email protected]> +2008-01-24 Michael Sperber <[email protected]> * mail-source.el (mail-sources): Add `group' choice. @@ -16,13 +12,6 @@ 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.