[gnus git] branch master updated: n0-17-336-g74fd646 =2= (gnus-uu-grab-articles): Require gnus-async so that `gnus-asynchronous' isn't shadowed. ; Resolve conflict.
Lars Magne Ingebrigtsen <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 74fd6463abf7dffc01b0940f0c4972011ab9efe1 (commit)
via 6cf32592c6010855603fb30c4e70a041a89fcee7 (commit)
from e820e3b9ac47d88c21d175fa709c8f87ea5f6144 (commit)
- Log -----------------------------------------------------------------
commit 74fd6463abf7dffc01b0940f0c4972011ab9efe1
Author: Lars Magne Ingebrigtsen <[email protected]>
Date: Tue Sep 27 19:29:01 2011 +0200
(gnus-uu-grab-articles): Require gnus-async so that `gnus-asynchronous' isn't shadowed.
diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index 05ba359..15c3d41 100644
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -1290,6 +1290,7 @@ When called interactively, prompt for REGEXP."
;; the process-function has been successful and nil otherwise.
(defun gnus-uu-grab-articles (articles process-function
&optional sloppy limit no-errors)
+ (require 'gnus-async)
(let ((state 'first)
(gnus-asynchronous nil)
(gnus-inhibit-treatment t)
commit 6cf32592c6010855603fb30c4e70a041a89fcee7
Author: Lars Magne Ingebrigtsen <[email protected]>
Date: Tue Sep 27 19:29:56 2011 +0200
Resolve conflict.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fe0e57..2d9da87 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,11 @@
* plstore.el (plstore-select-keys, plstore-encrypt-to): Clarify
documentation.
+2011-09-27 Lars Magne Ingebrigtsen <[email protected]>
+
+ * gnus-uu.el (gnus-uu-grab-articles): Require gnus-async so that
+ `gnus-asynchronous' isn't shadowed.
+
2011-09-26 Lars Magne Ingebrigtsen <[email protected]>
* gnus-xmas.el (gnus-xmas-define): Add `member-ignore-case'.
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 5 +++++
lisp/gnus-uu.el | 1 +
2 files changed, 6 insertions(+), 0 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project