[Emacs-diffs] Changes to emacs/lisp/gnus/nnfolder.el

[ShengHuo ZHU]

Index: emacs/lisp/gnus/nnfolder.el
diff -c emacs/lisp/gnus/nnfolder.el:1.11 emacs/lisp/gnus/nnfolder.el:1.12
*** emacs/lisp/gnus/nnfolder.el:1.11    Thu Apr 11 23:11:40 2002
--- emacs/lisp/gnus/nnfolder.el Thu Aug 22 23:32:58 2002
***************
*** 34,39 ****
--- 34,40 ----
  (require 'nnoo)
  (eval-when-compile (require 'cl))
  (require 'gnus-util)
+ (require 'gnus-range)
  
  (nnoo-declare nnfolder)
  
***************
*** 349,355 ****
                       (buffer-substring
                        (point) (progn (end-of-line) (point)))
                       force nnfolder-inhibit-expiry))
!           (nnheader-message 5 "Deleting article %d..."
                              (car maybe-expirable) newsgroup)
            (nnfolder-delete-mail)
            ;; Must remember which articles were actually deleted
--- 350,363 ----
                       (buffer-substring
                        (point) (progn (end-of-line) (point)))
                       force nnfolder-inhibit-expiry))
!           (unless (eq nnmail-expiry-target 'delete)
!             (with-temp-buffer
!               (nnfolder-request-article (car maybe-expirable) 
!                                         newsgroup server (current-buffer))
!               (let ((nnml-current-directory nil))
!                 (nnmail-expiry-target-group
!                  nnmail-expiry-target newsgroup))))
!           (nnheader-message 5 "Deleting article %d in %s..."
                              (car maybe-expirable) newsgroup)
            (nnfolder-delete-mail)
            ;; Must remember which articles were actually deleted