[Emacs-diffs] trunk r113656: Merge changes made in Gnus trunk

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 113656
revision-id: address@hidden
parent: address@hidden
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2013-08-02 13:34:22 +0000
message:
  Merge changes made in Gnus trunk
  
  2013-08-02  Lars Magne Ingebrigtsen  <address@hidden>
  * gnus-group.el (gnus-group-delete-articles): Allow deleting only "old"
    articles.
  * gnus-delay.el (gnus-delay-article): Run `message-send-hook' so that
    we can get spell-checking etc.
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/gnus-delay.el        
gnusdelay.el-20091113204419-o5vbwnq5f7feedwu-3240
  lisp/gnus/gnus-group.el        
gnusgroup.el-20091113204419-o5vbwnq5f7feedwu-1120

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-08-02 08:36:15 +0000
+++ b/lisp/gnus/ChangeLog       2013-08-02 13:34:22 +0000
@@ -1,3 +1,13 @@
+2013-08-02  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * gnus-delay.el (gnus-delay-article): Fix typo.
+
+       * gnus-group.el (gnus-group-delete-articles): Allow deleting only "old"
+       articles.
+
+       * gnus-delay.el (gnus-delay-article): Run `message-send-hook' so that
+       we can get spell-checking etc.
+
 2013-08-02  Katsumi Yamaoka  <address@hidden>
 
        * rfc2047.el (rfc2047-encode-message-header): Unify charsets into

=== modified file 'lisp/gnus/gnus-delay.el'
--- a/lisp/gnus/gnus-delay.el   2013-03-05 17:13:01 +0000
+++ b/lisp/gnus/gnus-delay.el   2013-08-02 13:34:22 +0000
@@ -80,6 +80,8 @@
    (list (read-string
          "Target date (YYYY-MM-DD), time (hh:mm), or length of delay (units in 
[mhdwMY]): "
          gnus-delay-default-delay)))
+  ;; Allow spell checking etc.
+  (run-hooks 'message-send-hook)
   (let (num unit days year month day hour minute deadline)
     (cond ((string-match
            "\\([0-9][0-9][0-9]?[0-9]?\\)-\\([0-9]+\\)-\\([0-9]+\\)"

=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el   2013-07-02 10:38:58 +0000
+++ b/lisp/gnus/gnus-group.el   2013-08-02 13:34:22 +0000
@@ -2796,14 +2796,21 @@
        (lambda (group)
          (gnus-group-delete-group group nil t))))))
 
-(defun gnus-group-delete-articles (group)
-  "Delete all articles in the current group."
-  (interactive (list (gnus-group-group-name)))
+(defun gnus-group-delete-articles (group &optional oldp)
+  "Delete all articles in the current group.
+If OLDP (the prefix), only delete articles that are \"old\",
+according to the expiry settings.  Note that this will delete old
+not-expirable articles, too."
+  (interactive (list (gnus-group-group-name)
+                    current-prefix-arg))
   (let ((articles (gnus-uncompress-range (gnus-active group))))
     (when (gnus-yes-or-no-p
           (format "Do you really want to delete these %d articles forever? "
                   (length articles)))
-      (gnus-request-expire-articles articles group 'force))))
+      (gnus-request-expire-articles articles group
+                                   (if current-prefix-arg
+                                       nil
+                                     'force)))))
 
 (defun gnus-group-delete-group (group &optional force no-prompt)
   "Delete the current group.  Only meaningful with editable groups.