Index: gnus.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/gnus.el,v
retrieving revision 6.153
diff -r6.153 gnus.el
61a62,65
> (defgroup gnus-registry nil
>   "Article Registry."
>   :group 'gnus)
> 
3114,3115c3118,3120
< (defun gnus-group-prefixed-name (group method)
<   "Return the whole name from GROUP and METHOD."
---
> (defun gnus-group-prefixed-name (group method &optional full)
>   "Return the whole name from GROUP and METHOD.  Call with full set to
> get the fully qualified group name (even if the server is native)."
3118c3123
< 	  (gnus-server-equal method "native")
---
> 	  (and (not full) (gnus-server-equal method "native"))
3121a3127,3140
> 
> (defun gnus-group-guess-prefixed-name (group)
>   "Guess the whole name from GROUP and METHOD."
>   (gnus-group-prefixed-name group (gnus-find-method-for-group
> 			       group)))
> 
> (defun gnus-group-full-name (group method)
>   "Return the full name from GROUP and METHOD, even if the method is
> native."
>   (gnus-group-prefixed-name group method t))
> 
> (defun gnus-group-guess-full-name (group)
>   "Guess the full name from GROUP, even if the method is native."
>   (gnus-group-full-name group (gnus-find-method-for-group group)))
Index: gnus-sum.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/gnus-sum.el,v
retrieving revision 6.300
diff -r6.300 gnus-sum.el
849a850,864
> (defcustom gnus-summary-article-move-hook nil
>   "*A hook called after an article is moved, copied, respooled, or crossposted."
>   :group 'gnus-summary
>   :type 'hook)
> 
> (defcustom gnus-summary-article-delete-hook nil
>   "*A hook called after an article is deleted."
>   :group 'gnus-summary
>   :type 'hook)
> 
> (defcustom gnus-summary-article-expire-hook nil
>   "*A hook called after an article is expired."
>   :group 'gnus-summary
>   :type 'hook)
> 
8759,8760c8774,8781
< 	  (gnus-summary-mark-article article gnus-canceled-mark)
< 	  (gnus-message 4 "Deleted article %s" article)))
---
> 	  (let ((id (mail-header-id (gnus-data-header 
> 				     (assoc article (gnus-data-list nil))))))
> 	    (gnus-summary-mark-article article gnus-canceled-mark)
> 	    (gnus-message 4 "Deleted article %s" article)
> 	    ;; run the move/copy/crosspost/respool hook
> 	    (run-hook-with-args 'gnus-summary-article-delete-hook 
> 				action id gnus-newsgroup-name nil
> 				select-method))))
8838c8859,8866
< 	       article gnus-newsgroup-name (current-buffer)))))
---
> 	       article gnus-newsgroup-name (current-buffer))))
> 
> 	  ;; run the move/copy/crosspost/respool hook
> 	  (let ((id (mail-header-id (gnus-data-header 
> 				   (assoc article (gnus-data-list nil))))))
> 	  (run-hook-with-args 'gnus-summary-article-move-hook 
> 			      action id gnus-newsgroup-name to-newsgroup
> 			      select-method)))
9059c9087,9093
< 		  (gnus-summary-mark-article article gnus-canceled-mark))))))
---
> 		  (gnus-summary-mark-article article gnus-canceled-mark)
> 		  (let ((id (mail-header-id (gnus-data-header 
> 					     (assoc article 
> 						    (gnus-data-list nil))))))
> 		    (run-hook-with-args 'gnus-summary-article-expire-hook
> 					'delete id gnus-newsgroup-name nil
> 					nil)))))))
9107a9142,9147
> 	(let* ((article (car articles))
> 	       (id (mail-header-id (gnus-data-header 
> 				    (assoc article (gnus-data-list nil))))))
> 	  (run-hook-with-args 'gnus-summary-article-delete-hook
> 			      'delete id gnus-newsgroup-name nil
> 			      nil))