[Emacs-diffs] /srv/bzr/emacs/trunk r103348: nnimap.el (nnimap-parse-copied-articles): Allow for "<foo> OK" outputs from the server.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 103348
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-19 09:45:07 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-art.el
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-02-18 23:15:24 +0000
+++ b/lisp/gnus/ChangeLog       2011-02-19 09:45:07 +0000
@@ -1,3 +1,13 @@
+2011-02-19  Lars Ingebrigtsen  <address@hidden>
+
+       * nnimap.el (nnimap-parse-copied-articles): Allow for "<foo> OK"
+       outputs from the server.
+
+2011-02-18  Antoine Levitt  <address@hidden>  (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  <address@hidden>
 
        * auth-source.el (auth-source-search): Don't try to create credentials

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2011-02-15 11:24:37 +0000
+++ b/lisp/gnus/gnus-art.el     2011-02-19 09:45:07 +0000
@@ -4637,6 +4637,7 @@
              (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 @@
          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

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2011-02-18 00:41:50 +0000
+++ b/lisp/gnus/nnimap.el       2011-02-19 09:45:07 +0000
@@ -1823,7 +1823,7 @@
 (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)))