Synch to No Gnus 200409101504.

[elisp/gnus.git-] / lisp / nntp.el

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 53ce24c..bdaa7b6 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -32,9 +32,14 @@
 (require 'nnheader)
 (require 'nnoo)
 (require 'gnus-util)
+(require 'gnus)
 
 (nnoo-declare nntp)
 
+(defgroup nntp nil
+  "NNTP access for Gnus."
+  :group 'gnus)
+
 (defvoo nntp-address nil
   "Address of the physical nntp server.")
 
@@ -220,7 +225,7 @@ server there that you can connect to.  See also
 
 ;; Marks
 (defvoo nntp-marks-is-evil nil
-  "*If non-nil, GNus will never generate and use marks file for nntp groups.
+  "*If non-nil, Gnus will never generate and use marks file for nntp groups.
 See `nnml-marks-is-evil' for more information.")
 
 (defvoo nntp-marks-file-name ".marks")
@@ -235,6 +240,7 @@ See `nnml-marks-is-evil' for more information.")
 
 (defcustom nntp-authinfo-file "~/.authinfo"
   ".netrc-like file that holds nntp authinfo passwords."
+  :group 'nntp
   :type
   '(choice file
           (repeat :tag "Entries"
@@ -1155,11 +1161,11 @@ and a password.
 
 If SEND-IF-FORCE, only send authinfo to the server if the
 .authinfo file has the FORCE token."
-  (let* ((list (gnus-parse-netrc nntp-authinfo-file))
-        (alist (gnus-netrc-machine list nntp-address "nntp"))
-        (force (gnus-netrc-get alist "force"))
-        (user (or (gnus-netrc-get alist "login") nntp-authinfo-user))
-        (passwd (gnus-netrc-get alist "password")))
+  (let* ((list (netrc-parse nntp-authinfo-file))
+        (alist (netrc-machine list nntp-address "nntp"))
+        (force (netrc-get alist "force"))
+        (user (or (netrc-get alist "login") nntp-authinfo-user))
+        (passwd (netrc-get alist "password")))
     (when (or (not send-if-force)
              force)
       (unless user