* gnus.el (gnus-nntp-server): Move to gnus-int.el to silence bytecomp.

[gnu-emacs] / lisp / gnus / nndraft.el

diff --git a/lisp/gnus/nndraft.el b/lisp/gnus/nndraft.el
index 5275468bb6fc971b1b196bd0a11141ab5bfc82ce..0b47062a919384fa4998042d07ffa8d836f9011e 100644 (file)
--- a/lisp/gnus/nndraft.el
+++ b/lisp/gnus/nndraft.el
@@ -24,14 +24,21 @@
 
 ;;; Code:
 
+;; For Emacs <22.2 and XEmacs.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
 (require 'nnheader)
 (require 'nnmail)
 (require 'gnus-start)
+(require 'gnus-group)
 (require 'nnmh)
 (require 'nnoo)
 (require 'mm-util)
 (eval-when-compile (require 'cl))
 
+(declare-function nndraft-request-list "nnmh" (&rest args))
+
 (nnoo-declare nndraft
   nnmh)
 
@@ -165,11 +172,22 @@ are generated if and only if they are also in `message-draft-headers'.")
   "Update groups' unread articles in the group buffer."
   (nndraft-request-list)
   (with-current-buffer gnus-group-buffer
-    (let ((gnus-group-marked
-          (mapcar (lambda (elem)
-                    (gnus-group-prefixed-name (car elem) (list 'nndraft "")))
-                  (nnmail-get-active))))
-      (gnus-group-get-new-news-this-group nil t))))
+    (let* ((groups (mapcar (lambda (elem)
+                            (gnus-group-prefixed-name (car elem)
+                                                      (list 'nndraft "")))
+                          (nnmail-get-active)))
+          (gnus-group-marked (copy-sequence groups))
+          ;; Don't send delayed articles.
+          (gnus-get-new-news-hook nil)
+          (inhibit-read-only t))
+      (gnus-group-get-new-news-this-group nil t)
+      (dolist (group groups)
+       (unless (and gnus-permanently-visible-groups
+                    (string-match gnus-permanently-visible-groups
+                                  group))
+         (gnus-group-goto-group group)
+         (when (zerop (gnus-group-group-unread))
+           (gnus-delete-line)))))))
 
 (deffoo nndraft-request-associate-buffer (group)
   "Associate the current buffer with some article in the draft group."