(gnus-summary-delete-article): Don't alter the registry on failed delete.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 394244f..f57c662 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-29  Andrew Cohen  <cohen@andy.bu.edu>
+
+       * gnus-sum.el (gnus-summary-delete-article): If delete fails don't
+       change the registry.
+

 2010-11-29  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * nnir.el (nnir-run-gmane): Use mm-delete-duplicates instead of
 2010-11-29  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * nnir.el (nnir-run-gmane): Use mm-delete-duplicates instead of

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 2d679da..5e90bd9 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -10213,13 +10213,13 @@ confirmation before the articles are deleted."
          ;; The backend might not have been able to delete the article
          ;; after all.
          (unless (memq (car articles) not-deleted)
          ;; The backend might not have been able to delete the article
          ;; after all.
          (unless (memq (car articles) not-deleted)

-           (gnus-summary-mark-article (car articles) gnus-canceled-mark))
-         (let* ((article (car articles))
-                (ghead  (gnus-data-header
-                         (assoc article (gnus-data-list nil)))))
-           (run-hook-with-args 'gnus-summary-article-delete-hook
-                               'delete ghead gnus-newsgroup-name nil
-                               nil))
+           (gnus-summary-mark-article (car articles) gnus-canceled-mark)
+           (let* ((article (car articles))
+                  (ghead  (gnus-data-header
+                           (assoc article (gnus-data-list nil)))))
+             (run-hook-with-args 'gnus-summary-article-delete-hook
+                                 'delete ghead gnus-newsgroup-name nil
+                                 nil)))

          (setq articles (cdr articles))))
       (when not-deleted
        (gnus-message 4 "Couldn't delete articles %s" not-deleted)))
          (setq articles (cdr articles))))
       (when not-deleted
        (gnus-message 4 "Couldn't delete articles %s" not-deleted)))