[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-cus.el

[Miles Bader]

Index: emacs/lisp/gnus/gnus-cus.el
diff -c emacs/lisp/gnus/gnus-cus.el:1.6 emacs/lisp/gnus/gnus-cus.el:1.7
*** emacs/lisp/gnus/gnus-cus.el:1.6     Wed Dec 20 15:20:51 2000
--- emacs/lisp/gnus/gnus-cus.el Fri Oct 18 04:38:17 2002
***************
*** 251,273 ****
  
      (charset (symbol :tag "Charset") "\
  The default charset to use in the group.")
!            
!     (ignored-charsets 
!      (choice :tag "Ignored charsets" 
             :value nil
             (repeat (symbol))) "\
  List of charsets that should be ignored.
  
  When these charsets are used in the \"charset\" parameter, the
  default charset will be used instead.")
!            
!     (highlight-words 
       (choice :tag "Highlight words"
             :value nil
             (repeat (list (regexp :tag "Highlight regexp")
                           (number :tag "Group for entire word" 0)
                           (number :tag "Group for displayed part" 0)
!                          (symbol :tag "Face" 
                                   gnus-emphasis-highlight-words))))
       "highlight regexps.
  See gnus-emphasis-alist.")
--- 251,273 ----
  
      (charset (symbol :tag "Charset") "\
  The default charset to use in the group.")
! 
!     (ignored-charsets
!      (choice :tag "Ignored charsets"
             :value nil
             (repeat (symbol))) "\
  List of charsets that should be ignored.
  
  When these charsets are used in the \"charset\" parameter, the
  default charset will be used instead.")
! 
!     (highlight-words
       (choice :tag "Highlight words"
             :value nil
             (repeat (list (regexp :tag "Highlight regexp")
                           (number :tag "Group for entire word" 0)
                           (number :tag "Group for displayed part" 0)
!                          (symbol :tag "Face"
                                   gnus-emphasis-highlight-words))))
       "highlight regexps.
  See gnus-emphasis-alist.")
***************
*** 279,286 ****
                      (choice :tag "Type"
                              :value nil
                              (const signature)
!                             (const signature-file) 
!                             (const organization) 
                              (const address)
                              (const name)
                              (const body))
--- 279,286 ----
                      (choice :tag "Type"
                              :value nil
                              (const signature)
!                             (const signature-file)
!                             (const organization)
                              (const address)
                              (const name)
                              (const body))
***************
*** 297,303 ****
    '((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
--- 297,303 ----
    '((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
***************
*** 326,339 ****
                                :doc ,(nth 2 entry)
                                (const :format "" ,(nth 0 entry))
                                ,(nth 1 entry)))
!                      (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)
!       (error "Both a group an topic on current line"))
      (unless (or topic (setq info (gnus-get-info group)))
        (error "Killed group; can't be edited"))
      ;; Ready.
--- 326,339 ----
                                :doc ,(nth 2 entry)
                                (const :format "" ,(nth 0 entry))
                                ,(nth 1 entry)))
!                      (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)
!       (error "Both a group and topic on current line"))
      (unless (or topic (setq info (gnus-get-info group)))
        (error "Killed group; can't be edited"))
      ;; Ready.