; Merge from origin/emacs-25

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

diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el
index a2a4cd3e07d5e861029b561ed44b1c9b9482ad42..f5299bea806393ba3b392e846997091bfc5d46a0 100644 (file)
--- a/lisp/gnus/gnus-draft.el
+++ b/lisp/gnus/gnus-draft.el
@@ -1,6 +1,6 @@
 ;;; gnus-draft.el --- draft message support for Gnus
 
-;; Copyright (C) 1997-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2016 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -31,9 +31,6 @@
 (require 'nndraft)
 (require 'gnus-agent)
 (eval-when-compile (require 'cl))
-(eval-when-compile
-  (when (featurep 'xemacs)
-    (require 'easy-mmode))) ; for `define-minor-mode'
 
 ;;; Draft minor mode
 
@@ -320,23 +317,14 @@ If DONT-POP is nil, display the buffer after setting it up."
        (let* ((window (get-buffer-window buff t))
               (frame (and window (window-frame window))))
          (if frame
-             (gnus-select-frame-set-input-focus frame)
+             (select-frame-set-input-focus frame)
            (pop-to-buffer buff t)))
        (error "The draft %s is under edit" file)))))
 
 (defun gnus-draft-clear-marks ()
-  (setq gnus-newsgroup-marked nil
-       gnus-newsgroup-unreads (gnus-uncompress-range
-                               (gnus-active gnus-newsgroup-name)))
-  ;; Mark articles except for deleted ones as unread.
-  (let (rest)
-    (dolist (article gnus-newsgroup-reads)
-      (when (and (consp article)
-                (eq (cdr article) gnus-canceled-mark))
-       (push article rest)
-       (setq gnus-newsgroup-unreads
-             (delq (car article) gnus-newsgroup-unreads))))
-    (setq gnus-newsgroup-reads (nreverse rest))))
+  (setq gnus-newsgroup-reads nil
+       gnus-newsgroup-marked nil
+       gnus-newsgroup-unreads (nndraft-articles)))
 
 (provide 'gnus-draft)