--- a/lisp/gnus/gnus.el	Mon Aug 13 09:13:58 2007 +0200
+++ b/lisp/gnus/gnus.el	Mon Aug 13 09:15:11 2007 +0200
@@ -39,6 +39,10 @@
   "Starting your favorite newsreader."
   :group 'gnus)
 
+(defgroup gnus-start-server nil
+  "Server options at startup."
+  :group 'gnus-start)
+
 ;; These belong to gnus-group.el.
 (defgroup gnus-group nil
   "Group buffers."
@@ -50,6 +54,10 @@
   :link '(custom-manual "(gnus)Foreign Groups")
   :group 'gnus-group)
 
+(defgroup gnus-group-new nil
+  "Automatic subscription of new groups."
+  :group 'gnus-group)
+
 (defgroup gnus-group-levels nil
   "Group levels."
   :link '(custom-manual "(gnus)Group Levels")
@@ -152,6 +160,18 @@
   "Adaptive score files."
   :group 'gnus-score)
 
+(defgroup gnus-score-default nil
+  "Default values for score files."
+  :group 'gnus-score)
+
+(defgroup gnus-score-expire nil
+  "Expiring score rules."
+  :group 'gnus-score)
+
+(defgroup gnus-score-decay nil
+  "Decaying score rules."
+  :group 'gnus-score)
+
 (defgroup gnus-score-files nil
   "Score and kill file names."
   :group 'gnus-score
@@ -166,14 +186,19 @@
   "Options controling the visual fluff."
   :group 'gnus)
 
-(defgroup gnus-mail-expire nil
-  "Expiring articles in mail backends."
-  :group 'gnus-mail)
-
 (defgroup gnus-files nil
   "Files used by Gnus."
   :group 'gnus)
 
+(defgroup gnus-dribble-file nil
+  "Auto save file."
+  :link '(custom-manual "(gnus)Auto Save")
+  :group 'gnus-files)
+
+(defgroup gnus-newsrc nil
+  "Storing Gnus state."
+  :group 'gnus-files)
+
 (defgroup gnus-server nil
   "Options related to newsservers and other servers used by Gnus."
   :group 'gnus)
@@ -198,7 +223,7 @@
   :link '(custom-manual "(gnus)Exiting Gnus")
   :group 'gnus)
 
-(defconst gnus-version-number "5.4.12"
+(defconst gnus-version-number "5.4.15"
   "Version number for this version of Gnus.")
 
 (defconst gnus-version (format "Gnus v%s" gnus-version-number)
@@ -1174,7 +1199,7 @@
   "*Groups in which to automatically mark read articles as expirable.
 If non-nil, this should be a regexp that should match all groups in
 which to perform auto-expiry.  This only makes sense for mail groups."
-  :group 'gnus-mail-expire
+  :group 'nnmail-expire
   :type '(choice (const nil)
 		 regexp))
 
@@ -1184,7 +1209,7 @@
 expiring - which means that all read articles will be deleted after
 \(say) one week.	 (This only goes for mail groups and the like, of
 course.)"
-  :group 'gnus-mail-expire
+  :group 'nnmail-expire
   :type '(choice (const nil)
 		 regexp))
 
@@ -1577,7 +1602,7 @@
       gnus-uu-decode-uu-and-save-view gnus-uu-decode-unshar-view
       gnus-uu-decode-unshar-and-save-view gnus-uu-decode-save-view
       gnus-uu-decode-binhex-view)
-     ("gnus-uu" gnus-uu-delete-work-dir)
+     ("gnus-uu" gnus-uu-delete-work-dir gnus-quote-arg-for-sh-or-csh)
      ("gnus-msg" (gnus-summary-send-map keymap)
       gnus-article-mail gnus-copy-article-buffer gnus-extended-version)
      ("gnus-msg" :interactive t