Various customization improvements.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4aea87..4575178 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+1999-11-12  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+       * gnus-start.el (gnus-level-subscribed, gnus-level-unsubscribed,
+       gnus-level-zombie, gnus-level-killed): Changed from `defcustom' to
+       `defconst'.
+
+       * gnus-cus.el (gnus-group-parameters): Changed from `defcustom' to
+       `defconst'. 
+       mention that it is both for group and topic parameters. 
+       (gnus-extra-topic-parameters): New constant, including `subscribe'
+       parameter. 
+       (gnus-extra-group-parameters): New constant.
+       (gnus-group-customize): Use them.
+
+       * gnus.el (gnus-select-method): Added default value and tag.
+       (gnus-refer-article-method): Added `DejaNews' customization option.
+
 1999-11-12 05:04:43  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-int.el (gnus-server-opened): Ignore denied servers.

diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el
index 8127d65..995d6b4 100644 (file)
--- a/lisp/gnus-cus.el
+++ b/lisp/gnus-cus.el
@@ -56,7 +56,7 @@ if that value is non-nil."
 
 ;;; Group Customization:
 
-(defcustom gnus-group-parameters
+(defconst gnus-group-parameters
   '((to-address (gnus-email-address :tag "To Address") "\
 This will be used when doing followups and posts.
 
@@ -238,12 +238,29 @@ default charset will be used instead.")
                                   gnus-emphasis-highlight-words))))
   "highlight regexps.
 See gnus-emphasis-alist."))
-  "Alist of valid group parameters.
+  "Alist of valid group or topic parameters.
 
 Each entry has the form (NAME TYPE DOC), where NAME is the parameter
 itself (a symbol), TYPE is the parameters type (a sexp widget), and
 DOC is a documentation string for the parameter.")
 
+(defconst gnus-extra-topic-parameters
+  '((subscribe (regexp :tag "Subscribe") "\
+If `gnus-subscribe-newsgroup-method' is set to
+`gnus-subscribe-topics', new groups that matches this regexp will
+automatically be subscribed to this topic")) 
+  "Alist of topic parameters that are not also group parameters.
+
+Each entry has the form (NAME TYPE DOC), where NAME is the parameter
+itself (a symbol), TYPE is the parameters type (a sexp widget), and
+DOC is a documentation string for the parameter.")
+
+(defconst gnus-extra-group-parameters nil
+  "Alist of group parameters that are not also topic parameters.
+
+Each entry has the form (NAME TYPE DOC), where NAME is the parameter
+itself (a symbol), TYPE is the parameters type (a sexp widget), and
+DOC is a documentation string for the parameter.")
 (defvar gnus-custom-params)
 (defvar gnus-custom-method)
 (defvar gnus-custom-group)
@@ -258,7 +275,10 @@ DOC is a documentation string for the parameter.")
                                :doc ,(nth 2 entry)
                                (const :format "" ,(nth 0 entry))
                                ,(nth 1 entry)))
-                      gnus-group-parameters)))
+                      (append gnus-group-parameters 
+                              (if group
+                                  gnus-extra-group-parameters
+                                gnus-extra-topic-parameters)))))
     (unless (or group topic)
       (error "No group on current line"))
     (when (and group topic)

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index ea4ae3a..0d8d683 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -141,27 +141,19 @@ properly with all servers."
                 (const some)
                 (const t)))
 
-(defcustom gnus-level-subscribed 5
-  "*Groups with levels less than or equal to this variable are subscribed."
-  :group 'gnus-group-levels
-  :type 'integer)
+(defconst gnus-level-subscribed 5
+  "Groups with levels less than or equal to this variable are subscribed.")
 
-(defcustom gnus-level-unsubscribed 7
-  "*Groups with levels less than or equal to this variable are unsubscribed.
+(defconst gnus-level-unsubscribed 7
+  "Groups with levels less than or equal to this variable are unsubscribed.
 Groups with levels less than `gnus-level-subscribed', which should be
-less than this variable, are subscribed."
-  :group 'gnus-group-levels
-  :type 'integer)
+less than this variable, are subscribed.")
 
-(defcustom gnus-level-zombie 8
-  "*Groups with this level are zombie groups."
-  :group 'gnus-group-levels
-  :type 'integer)
+(defconst gnus-level-zombie 8
+  "Groups with this level are zombie groups.")
 
-(defcustom gnus-level-killed 9
-  "*Groups with this level are killed."
-  :group 'gnus-group-levels
-  :type 'integer)
+(defconst gnus-level-killed 9
+  "Groups with this level are killed.")
 
 (defcustom gnus-level-default-subscribed 3
   "*New subscribed groups will be subscribed at this level."

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 55c8d79..cd5c39d 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -999,6 +999,7 @@ The value of this variable must be a valid select method as discussed
 in the documentation of `gnus-select-method'."
   :group 'gnus-server
   :type '(choice (const :tag "default" nil)
+                (const :tag "DejaNews" (nnweb "refer" (nnweb-type dejanews)))
                 gnus-select-method))
 
 (defcustom gnus-group-faq-directory
@@ -1261,6 +1262,8 @@ this variable.    I think."
 
 (define-widget 'gnus-select-method 'list
   "Widget for entering a select method."
+  :value '(nntp "")
+  :tag "Select Method"
   :args `((choice :tag "Method"
                  ,@(mapcar (lambda (entry)
                              (list 'const :format "%v\n"

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 305a8ec..c53093c 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -10304,7 +10304,7 @@ The @samp{getmail} script would look something like the following:
 @example
 #!/bin/sh
 #  getmail - move mail from spool to stdout
-#  flu@iki.fi
+#  flu@@iki.fi
 
 MOVEMAIL=/usr/lib/emacs/20.3/i386-redhat-linux/movemail
 TMP=~/Mail/tmp