nnimap.el (nnimap-parse-copied-articles): Allow for "<foo> OK" outputs from the server.

gnus-art.el (gnus-article-prepare): Run gnus-article-prepare-hook later so that bbdb can hook in easier.

3 files changed, 13 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index af25ecae6ba..576cec2ca82 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-19  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el (nnimap-parse-copied-articles): Allow for "<foo> OK"
+        outputs from the server.
+
+2011-02-18  Antoine Levitt  <antoine.levitt@gmail.com>  (tiny change)
+
+        * gnus-art.el (gnus-article-prepare): Run gnus-article-prepare-hook
+        later so that bbdb can hook in easier.
+
 2011-02-18  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * auth-source.el (auth-source-search): Don't try to create credentials
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 82ad4974fd4..533b0100ae5 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4637,6 +4637,7 @@ If ALL-HEADERS is non-nil, no headers are hidden."
               (forward-line -1))
             (set-window-point (get-buffer-window (current-buffer)) (point))
             (gnus-configure-windows 'article)
+            (gnus-run-hooks 'gnus-article-prepare-hook)
             t))))))
 
 ;;;###autoload
@@ -4654,8 +4655,7 @@ If ALL-HEADERS is non-nil, no headers are hidden."
           gnus-article-image-alist nil)
     (gnus-run-hooks 'gnus-tmp-internal-hook)
     (when gnus-display-mime-function
-      (funcall gnus-display-mime-function))
-    (gnus-run-hooks 'gnus-article-prepare-hook)))
+      (funcall gnus-display-mime-function))))
 
 ;;;
 ;;; Gnus Sticky Article Mode
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 9c93ee8bbd9..6b726b23756 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1823,7 +1823,7 @@ textual parts.")
 (defun nnimap-parse-copied-articles (sequences)
   (let (sequence copied range)
     (goto-char (point-min))
-    (while (re-search-forward "^\\([0-9]+\\) OK " nil t)
+    (while (re-search-forward "^\\([0-9]+\\) OK\\b" nil t)
       (setq sequence (string-to-number (match-string 1)))
       (when (setq range (cadr (assq sequence sequences)))
         (push (gnus-uncompress-range range) copied)))