Merge from gnus--rel--5.10

[gnus] / lisp / nntp.el

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 2eea4ff..c8c14da 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1,7 +1,8 @@
 ;;; nntp.el --- nntp access for Gnus
 
 ;;; nntp.el --- nntp access for Gnus
 

-;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996,
-;; 1997, 1998, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993,
+;;   1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002,
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.

 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news


@@ -10,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published

-;; by the Free Software Foundation; either version 2, or (at your
+;; by the Free Software Foundation; either version 3, or (at your

 ;; option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful, but
 ;; option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful, but


@@ -20,7 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the

-;; Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.

 
 ;;; Commentary:
 
 
 ;;; Commentary:
 


@@ -29,11 +31,17 @@
 (require 'nnheader)
 (require 'nnoo)
 (require 'gnus-util)
 (require 'nnheader)
 (require 'nnoo)
 (require 'gnus-util)

+(require 'gnus)
+(require 'gnus-group) ;; gnus-group-name-charset

 
 (nnoo-declare nntp)
 
 (eval-when-compile (require 'cl))
 
 
 (nnoo-declare nntp)
 
 (eval-when-compile (require 'cl))
 

+(defgroup nntp nil
+  "NNTP access for Gnus."
+  :group 'gnus)
+

 (defvoo nntp-address nil
   "Address of the physical nntp server.")
 
 (defvoo nntp-address nil
   "Address of the physical nntp server.")
 


@@ -83,6 +91,21 @@ Indirect connections:
 - `nntp-open-via-rlogin-and-netcat',
 - `nntp-open-via-telnet-and-telnet'.")
 
 - `nntp-open-via-rlogin-and-netcat',
 - `nntp-open-via-telnet-and-telnet'.")
 

+(defvoo nntp-never-echoes-commands nil
+  "*Non-nil means the nntp server never echoes commands.
+It is reported that some nntps server doesn't echo commands.  So, you
+may want to set this to non-nil in the method for such a server setting
+`nntp-open-connection-function' to `nntp-open-ssl-stream' for example.
+Note that the `nntp-open-connection-functions-never-echo-commands'
+variable overrides the nil value of this variable.")
+
+(defvoo nntp-open-connection-functions-never-echo-commands
+    '(nntp-open-network-stream)
+  "*List of functions that never echo commands.
+Add or set a function which you set to `nntp-open-connection-function'
+to this list if it does not echo commands.  Note that a non-nil value
+of the `nntp-never-echoes-commands' variable overrides this variable.")
+

 (defvoo nntp-pre-command nil
   "*Pre-command to use with the various nntp-open-via-* methods.
 This is where you would put \"runsocks\" or stuff like that.")
 (defvoo nntp-pre-command nil
   "*Pre-command to use with the various nntp-open-via-* methods.
 This is where you would put \"runsocks\" or stuff like that.")


@@ -90,25 +113,15 @@ This is where you would put \"runsocks\" or stuff like that.")
 (defvoo nntp-telnet-command "telnet"
   "*Telnet command used to connect to the nntp server.
 This command is used by the methods `nntp-open-telnet-stream',
 (defvoo nntp-telnet-command "telnet"
   "*Telnet command used to connect to the nntp server.
 This command is used by the methods `nntp-open-telnet-stream',

-`nntp-open-via-rlogin-and-telnet' and `nntp-open-via-telnet-and-telnet'.
-
-See `nntp-netcat-command' for the `nntp-open-via-rlogin-and-netcat'
-method.")
+`nntp-open-via-rlogin-and-telnet' and `nntp-open-via-telnet-and-telnet'.")

 
 (defvoo nntp-telnet-switches '("-8")
   "*Switches given to the telnet command `nntp-telnet-command'.")
 
 
 (defvoo nntp-telnet-switches '("-8")
   "*Switches given to the telnet command `nntp-telnet-command'.")
 

-(defvoo nntp-netcat-command "nc"
-  "*Netcat command used to connect to the nntp server.
-This command is used by the `nntp-open-via-rlogin-and-netcat' method.")
-
-(defvoo nntp-netcat-switches nil
-  "*Switches given to the netcat command `nntp-netcat-command'.")
-

 (defvoo nntp-end-of-line "\r\n"
   "*String to use on the end of lines when talking to the NNTP server.
 (defvoo nntp-end-of-line "\r\n"
   "*String to use on the end of lines when talking to the NNTP server.

-This is \"\\r\\n\" by default, but should be \"\\n\" when
-using and indirect connection method (nntp-open-via-*).")
+This is \"\\r\\n\" by default, but should be \"\\n\" when using an indirect
+connection method (nntp-open-via-*).")

 
 (defvoo nntp-via-rlogin-command "rsh"
   "*Rlogin command used to connect to an intermediate host.
 
 (defvoo nntp-via-rlogin-command "rsh"
   "*Rlogin command used to connect to an intermediate host.


@@ -130,6 +143,13 @@ This command is used by the `nntp-open-via-telnet-and-telnet' method.")
 (defvoo nntp-via-telnet-switches '("-8")
   "*Switches given to the telnet command `nntp-via-telnet-command'.")
 
 (defvoo nntp-via-telnet-switches '("-8")
   "*Switches given to the telnet command `nntp-via-telnet-command'.")
 

+(defvoo nntp-via-netcat-command "nc"
+  "*Netcat command used to connect to the nntp server.
+This command is used by the `nntp-open-via-rlogin-and-netcat' method.")
+
+(defvoo nntp-via-netcat-switches nil
+  "*Switches given to the netcat command `nntp-via-netcat-command'.")
+

 (defvoo nntp-via-user-name nil
   "*User name to log in on an intermediate host with.
 This variable is used by the various nntp-open-via-* methods.")
 (defvoo nntp-via-user-name nil
   "*User name to log in on an intermediate host with.
 This variable is used by the various nntp-open-via-* methods.")


@@ -174,6 +194,14 @@ by one.")
 If the gap between two consecutive articles is bigger than this
 variable, split the XOVER request into two requests.")
 
 If the gap between two consecutive articles is bigger than this
 variable, split the XOVER request into two requests.")
 

+(defvoo nntp-xref-number-is-evil nil
+  "*If non-nil, Gnus never trusts article numbers in the Xref header.
+Some news servers, e.g., ones running Diablo, run multiple engines
+having the same articles but article numbers are not kept synchronized
+between them.  If you connect to such a server, set this to a non-nil
+value, and Gnus never uses article numbers (that appear in the Xref
+header and vary by which engine is chosen) to refer to articles.")
+

 (defvoo nntp-prepare-server-hook nil
   "*Hook run before a server is opened.
 If can be used to set up a server remotely, for instance.  Say you
 (defvoo nntp-prepare-server-hook nil
   "*Hook run before a server is opened.
 If can be used to set up a server remotely, for instance.  Say you


@@ -183,17 +211,30 @@ then use this hook to rsh to the remote machine and start a proxy NNTP
 server there that you can connect to.  See also
 `nntp-open-connection-function'")
 
 server there that you can connect to.  See also
 `nntp-open-connection-function'")
 

-(defvoo nntp-warn-about-losing-connection t
-  "*If non-nil, beep when a server closes connection.")
-

 (defvoo nntp-coding-system-for-read 'binary
   "*Coding system to read from NNTP.")
 
 (defvoo nntp-coding-system-for-write 'binary
   "*Coding system to write to NNTP.")
 
 (defvoo nntp-coding-system-for-read 'binary
   "*Coding system to read from NNTP.")
 
 (defvoo nntp-coding-system-for-write 'binary
   "*Coding system to write to NNTP.")
 

+;; Marks
+(defvoo nntp-marks-is-evil nil
+  "*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")
+(defvoo nntp-marks nil)
+(defvar nntp-marks-modtime (gnus-make-hashtable))
+
+(defcustom nntp-marks-directory
+  (nnheader-concat gnus-directory "marks/")
+  "*The directory where marks for nntp groups will be stored."
+  :group 'nntp
+  :type 'directory)
+

 (defcustom nntp-authinfo-file "~/.authinfo"
   ".netrc-like file that holds nntp authinfo passwords."
 (defcustom nntp-authinfo-file "~/.authinfo"
   ".netrc-like file that holds nntp authinfo passwords."

+  :group 'nntp

   :type
   '(choice file
           (repeat :tag "Entries"
   :type
   '(choice file
           (repeat :tag "Entries"


@@ -237,6 +278,7 @@ to insert Cancel-Lock headers.")
 (defvoo nntp-last-command nil)
 (defvoo nntp-authinfo-password nil)
 (defvoo nntp-authinfo-user nil)
 (defvoo nntp-last-command nil)
 (defvoo nntp-authinfo-password nil)
 (defvoo nntp-authinfo-user nil)

+(defvoo nntp-authinfo-force nil)

 
 (defvar nntp-connection-list nil)
 
 
 (defvar nntp-connection-list nil)
 


@@ -260,13 +302,20 @@ noticing asynchronous data.")
 (defvar nntp-async-timer nil)
 (defvar nntp-async-process-list nil)
 
 (defvar nntp-async-timer nil)
 (defvar nntp-async-process-list nil)
 

-(defvar nntp-ssl-program 
+(defvar nntp-ssl-program

   "openssl s_client -quiet -ssl3 -connect %s:%p"
 "A string containing commands for SSL connections.
 Within a string, %s is replaced with the server address and %p with
 port number on server.  The program should accept IMAP commands on
 stdin and return responses to stdout.")
 
   "openssl s_client -quiet -ssl3 -connect %s:%p"
 "A string containing commands for SSL connections.
 Within a string, %s is replaced with the server address and %p with
 port number on server.  The program should accept IMAP commands on
 stdin and return responses to stdout.")
 

+(defvar nntp-authinfo-rejected nil
+"A custom error condition used to report 'Authentication Rejected' errors.  
+Condition handlers that match just this condition ensure that the nntp 
+backend doesn't catch this error.")
+(put 'nntp-authinfo-rejected 'error-conditions '(error nntp-authinfo-rejected))
+(put 'nntp-authinfo-rejected 'error-message "Authorization Rejected")
+

 \f
 
 ;;; Internal functions.
 \f
 
 ;;; Internal functions.


@@ -317,16 +366,21 @@ be restored and the command retried."
 
 (defsubst nntp-wait-for (process wait-for buffer &optional decode discard)
   "Wait for WAIT-FOR to arrive from PROCESS."
 
 (defsubst nntp-wait-for (process wait-for buffer &optional decode discard)
   "Wait for WAIT-FOR to arrive from PROCESS."

+

   (save-excursion
     (set-buffer (process-buffer process))
     (goto-char (point-min))
   (save-excursion
     (set-buffer (process-buffer process))
     (goto-char (point-min))

+

     (while (and (or (not (memq (char-after (point)) '(?2 ?3 ?4 ?5)))
     (while (and (or (not (memq (char-after (point)) '(?2 ?3 ?4 ?5)))

-                   (looking-at "480"))
+                   (looking-at "48[02]"))

                (memq (process-status process) '(open run)))
                (memq (process-status process) '(open run)))

-      (when (looking-at "480")
-       (nntp-handle-authinfo process))
-      (when (looking-at "^.*\n")
-       (delete-region (point) (progn (forward-line 1) (point))))
+      (cond ((looking-at "480")
+            (nntp-handle-authinfo process))
+           ((looking-at "482")
+            (nnheader-report 'nntp (get 'nntp-authinfo-rejected 'error-message))
+            (signal 'nntp-authinfo-rejected nil))
+           ((looking-at "^.*\n")
+            (delete-region (point) (progn (forward-line 1) (point)))))

       (nntp-accept-process-output process)
       (goto-char (point-min)))
     (prog1
       (nntp-accept-process-output process)
       (goto-char (point-min)))
     (prog1


@@ -422,6 +476,8 @@ be restored and the command retried."
                  (wait-for
                   (nntp-wait-for process wait-for buffer decode))
                  (t t)))
                  (wait-for
                   (nntp-wait-for process wait-for buffer decode))
                  (t t)))

+           (nntp-authinfo-rejected
+            (signal 'nntp-authinfo-rejected (cdr err)))

             (error
              (nnheader-report 'nntp "Couldn't open connection to %s: %s"
                               address err))
             (error
              (nnheader-report 'nntp "Couldn't open connection to %s: %s"
                               address err))


@@ -447,19 +503,22 @@ be restored and the command retried."
                                nntp-server-buffer
                                wait-for nnheader-callback-function)
          ;; If nothing to wait for, still remove possibly echo'ed commands.
                                nntp-server-buffer
                                wait-for nnheader-callback-function)
          ;; If nothing to wait for, still remove possibly echo'ed commands.

-         ;; We don't have echos if nntp-open-connection-function
-         ;; is `nntp-open-network-stream', so we skip this in that case.
+         ;; We don't have echoes if `nntp-never-echoes-commands' is non-nil
+         ;; or the value of `nntp-open-connection-function' is in
+         ;; `nntp-open-connection-functions-never-echo-commands', so we
+         ;; skip this in that cases.

          (unless (or wait-for
          (unless (or wait-for

-                     (equal nntp-open-connection-function
-                            'nntp-open-network-stream))
+                     nntp-never-echoes-commands
+                     (memq
+                      nntp-open-connection-function
+                      nntp-open-connection-functions-never-echo-commands))

            (nntp-accept-response)
            (save-excursion
              (set-buffer buffer)
              (goto-char pos)
              (if (looking-at (regexp-quote command))
                  (delete-region pos (progn (forward-line 1)
            (nntp-accept-response)
            (save-excursion
              (set-buffer buffer)
              (goto-char pos)
              (if (looking-at (regexp-quote command))
                  (delete-region pos (progn (forward-line 1)

-                                           (point-at-bol))))
-             )))
+                                           (point-at-bol)))))))

       (nnheader-report 'nntp "Couldn't open connection to %s."
                       nntp-address))))
 
       (nnheader-report 'nntp "Couldn't open connection to %s."
                       nntp-address))))
 


@@ -542,7 +601,12 @@ be restored and the command retried."
    ;; a line with only a "." on it.
    ((eq (char-after) ?2)
     (if (re-search-forward "\n\\.\r?\n" nil t)
    ;; a line with only a "." on it.
    ((eq (char-after) ?2)
     (if (re-search-forward "\n\\.\r?\n" nil t)

-       t
+       (progn
+         ;; Some broken news servers add another dot at the end.
+         ;; Protect against inflooping there.
+         (while (looking-at "^\\.\r?\n")
+           (forward-line 1))
+         t)

       nil))
    ;; A result that starts with a 3xx or 4xx code is terminated
    ;; by a newline.
       nil))
    ;; A result that starts with a 3xx or 4xx code is terminated
    ;; by a newline.


@@ -604,7 +668,8 @@ command whose response triggered the error."
                           (condition-case nil
                              (progn ,@forms)
                            (quit
                           (condition-case nil
                              (progn ,@forms)
                            (quit

-                            (nntp-close-server)
+                            (unless debug-on-quit
+                              (nntp-close-server))

                              (signal 'quit nil))))
                  (when timer
                    (nnheader-cancel-timer timer)))
                              (signal 'quit nil))))
                  (when timer
                    (nnheader-cancel-timer timer)))


@@ -891,7 +956,7 @@ command whose response triggered the error."
     (if (numberp article) (int-to-string article) article))))
 
 (deffoo nntp-request-group (group &optional server dont-check)
     (if (numberp article) (int-to-string article) article))))
 
 (deffoo nntp-request-group (group &optional server dont-check)

-  (nntp-with-open-group 
+  (nntp-with-open-group

     nil server
     (when (nntp-send-command "^[245].*\n" "GROUP" group)
       (let ((entry (nntp-find-connection-entry nntp-server-buffer)))
     nil server
     (when (nntp-send-command "^[245].*\n" "GROUP" group)
       (let ((entry (nntp-find-connection-entry nntp-server-buffer)))


@@ -1012,6 +1077,54 @@ command whose response triggered the error."
 (deffoo nntp-asynchronous-p ()
   t)
 
 (deffoo nntp-asynchronous-p ()
   t)
 

+(deffoo nntp-request-set-mark (group actions &optional server)
+  (unless nntp-marks-is-evil
+    (nntp-possibly-create-directory group server)
+    (nntp-open-marks group server)
+    (dolist (action actions)
+      (let ((range (nth 0 action))
+           (what  (nth 1 action))
+           (marks (nth 2 action)))
+       (assert (or (eq what 'add) (eq what 'del)) nil
+               "Unknown request-set-mark action: %s" what)
+       (dolist (mark marks)
+         (setq nntp-marks (gnus-update-alist-soft
+                           mark
+                           (funcall (if (eq what 'add) 'gnus-range-add
+                                      'gnus-remove-from-range)
+                                    (cdr (assoc mark nntp-marks)) range)
+                           nntp-marks)))))
+    (nntp-save-marks group server))
+  nil)
+
+(deffoo nntp-request-update-info (group info &optional server)
+  (unless nntp-marks-is-evil
+    (nntp-possibly-create-directory group server)
+    (when (nntp-marks-changed-p group server)
+      (nnheader-message 8 "Updating marks for %s..." group)
+      (nntp-open-marks group server)
+      ;; Update info using `nntp-marks'.
+      (mapc (lambda (pred)
+             (unless (memq (cdr pred) gnus-article-unpropagated-mark-lists)
+               (gnus-info-set-marks
+                info
+                (gnus-update-alist-soft
+                 (cdr pred)
+                 (cdr (assq (cdr pred) nntp-marks))
+                 (gnus-info-marks info))
+                t)))
+           gnus-article-mark-lists)
+      (let ((seen (cdr (assq 'read nntp-marks))))
+       (gnus-info-set-read info
+                           (if (and (integerp (car seen))
+                                    (null (cdr seen)))
+                               (list (cons (car seen) (car seen)))
+                             seen)))
+      (nnheader-message 8 "Updating marks for %s...done" group)))
+  nil)
+
+
+

 ;;; Hooky functions.
 
 (defun nntp-send-mode-reader ()
 ;;; Hooky functions.
 
 (defun nntp-send-mode-reader ()


@@ -1029,11 +1142,11 @@ and a password.
 
 If SEND-IF-FORCE, only send authinfo to the server if the
 .authinfo file has the FORCE token."
 
 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 (or (netrc-get alist "force") nntp-authinfo-force))
+        (user (or (netrc-get alist "login") nntp-authinfo-user))
+        (passwd (netrc-get alist "password")))

     (when (or (not send-if-force)
              force)
       (unless user
     (when (or (not send-if-force)
              force)
       (unless user


@@ -1119,7 +1232,7 @@ password contained in '~/.nntp-authinfo'."
                (funcall nntp-open-connection-function pbuffer))
            (error nil)
            (quit
                (funcall nntp-open-connection-function pbuffer))
            (error nil)
            (quit

-            (message "Quit opening connection")
+            (message "Quit opening connection to %s" nntp-address)

             (nntp-kill-buffer pbuffer)
             (signal 'quit nil)
             nil))))
             (nntp-kill-buffer pbuffer)
             (signal 'quit nil)
             nil))))


@@ -1129,7 +1242,7 @@ password contained in '~/.nntp-authinfo'."
       (nntp-kill-buffer pbuffer))
     (when (and (buffer-name pbuffer)
               process)
       (nntp-kill-buffer pbuffer))
     (when (and (buffer-name pbuffer)
               process)

-      (process-kill-without-query process)
+      (gnus-set-process-query-on-exit-flag process nil)

       (if (and (nntp-wait-for process "^2.*\n" buffer nil t)
               (memq (process-status process) '(open run)))
          (prog1
       (if (and (nntp-wait-for process "^2.*\n" buffer nil t)
               (memq (process-status process) '(open run)))
          (prog1


@@ -1149,20 +1262,21 @@ password contained in '~/.nntp-authinfo'."
 (defun nntp-open-network-stream (buffer)
   (open-network-stream "nntpd" buffer nntp-address nntp-port-number))
 
 (defun nntp-open-network-stream (buffer)
   (open-network-stream "nntpd" buffer nntp-address nntp-port-number))
 

-(autoload 'format-spec "format")
-(autoload 'format-spec-make "format")
-(autoload 'open-tls-stream "tls")
+(eval-and-compile
+  (autoload 'format-spec "format-spec")
+  (autoload 'format-spec-make "format-spec")
+  (autoload 'open-tls-stream "tls"))

 
 (defun nntp-open-ssl-stream (buffer)
   (let* ((process-connection-type nil)
 
 (defun nntp-open-ssl-stream (buffer)
   (let* ((process-connection-type nil)

-        (proc (start-process "nntpd" buffer 
+        (proc (start-process "nntpd" buffer

                              shell-file-name
                              shell-command-switch
                              shell-file-name
                              shell-command-switch

-                             (format-spec nntp-ssl-program 
+                             (format-spec nntp-ssl-program

                                           (format-spec-make
                                            ?s nntp-address
                                            ?p nntp-port-number)))))
                                           (format-spec-make
                                            ?s nntp-address
                                            ?p nntp-port-number)))))

-    (process-kill-without-query proc)
+    (gnus-set-process-query-on-exit-flag proc nil)

     (save-excursion
       (set-buffer buffer)
       (let ((nntp-connection-alist (list proc buffer nil)))
     (save-excursion
       (set-buffer buffer)
       (let ((nntp-connection-alist (list proc buffer nil)))


@@ -1173,7 +1287,7 @@ password contained in '~/.nntp-authinfo'."
 
 (defun nntp-open-tls-stream (buffer)
   (let ((proc (open-tls-stream "nntpd" buffer nntp-address nntp-port-number)))
 
 (defun nntp-open-tls-stream (buffer)
   (let ((proc (open-tls-stream "nntpd" buffer nntp-address nntp-port-number)))

-    (process-kill-without-query proc)
+    (gnus-set-process-query-on-exit-flag proc nil)

     (save-excursion
       (set-buffer buffer)
       (let ((nntp-connection-alist (list proc buffer nil)))
     (save-excursion
       (set-buffer buffer)
       (let ((nntp-connection-alist (list proc buffer nil)))


@@ -1186,12 +1300,9 @@ password contained in '~/.nntp-authinfo'."
   "Find out what the name of the server we have connected to is."
   ;; Wait for the status string to arrive.
   (setq nntp-server-type (buffer-string))
   "Find out what the name of the server we have connected to is."
   ;; Wait for the status string to arrive.
   (setq nntp-server-type (buffer-string))

-  (let ((alist nntp-server-action-alist)
-       (case-fold-search t)
-       entry)
+  (let ((case-fold-search t))

     ;; Run server-specific commands.
     ;; Run server-specific commands.

-    (while alist
-      (setq entry (pop alist))
+    (dolist (entry nntp-server-action-alist)

       (when (string-match (car entry) nntp-server-type)
        (if (and (listp (cadr entry))
                 (not (eq 'lambda (caadr entry))))
       (when (string-match (car entry) nntp-server-type)
        (if (and (listp (cadr entry))
                 (not (eq 'lambda (caadr entry))))


@@ -1303,22 +1414,22 @@ password contained in '~/.nntp-authinfo'."
 
 (defun nntp-accept-process-output (process)
   "Wait for output from PROCESS and message some dots."
 
 (defun nntp-accept-process-output (process)
   "Wait for output from PROCESS and message some dots."

-  (save-excursion
-    (set-buffer (or (nntp-find-connection-buffer nntp-server-buffer)
-                   nntp-server-buffer))
+  (with-current-buffer (or (nntp-find-connection-buffer nntp-server-buffer)
+                           nntp-server-buffer)

     (let ((len (/ (buffer-size) 1024))
          message-log-max)
       (unless (< len 10)
        (setq nntp-have-messaged t)
        (nnheader-message 7 "nntp read: %dk" len)))
     (let ((len (/ (buffer-size) 1024))
          message-log-max)
       (unless (< len 10)
        (setq nntp-have-messaged t)
        (nnheader-message 7 "nntp read: %dk" len)))

-    (nnheader-accept-process-output process)
-    ;; accept-process-output may update status of process to indicate
-    ;; that the server has closed the connection.  This MUST be
-    ;; handled here as the buffer restored by the save-excursion may
-    ;; be the process's former output buffer (i.e. now killed)
-    (or (and process 
-            (memq (process-status process) '(open run)))
-        (nntp-report "Server closed connection"))))
+    (prog1
+       (nnheader-accept-process-output process)
+      ;; accept-process-output may update status of process to indicate
+      ;; that the server has closed the connection.  This MUST be
+      ;; handled here as the buffer restored by the save-excursion may
+      ;; be the process's former output buffer (i.e. now killed)
+      (or (and process
+              (memq (process-status process) '(open run)))
+          (nntp-report "Server closed connection")))))

 
 (defun nntp-accept-response ()
   "Wait for output from the process that outputs to BUFFER."
 
 (defun nntp-accept-response ()
   "Wait for output from the process that outputs to BUFFER."


@@ -1497,8 +1608,8 @@ password contained in '~/.nntp-authinfo'."
         (when (<= count 1)
           (goto-char (point-min))
           (when (re-search-forward "^[0-9][0-9][0-9] .*\n\\([0-9]+\\)" nil t)
         (when (<= count 1)
           (goto-char (point-min))
           (when (re-search-forward "^[0-9][0-9][0-9] .*\n\\([0-9]+\\)" nil t)

-            (let ((low-limit (string-to-int
-                             (buffer-substring (match-beginning 1) 
+            (let ((low-limit (string-to-number
+                             (buffer-substring (match-beginning 1)

                                                (match-end 1)))))
               (while (and articles (<= (car articles) low-limit))
                 (setq articles (cdr articles))))))
                                                (match-end 1)))))
               (while (and articles (<= (car articles) low-limit))
                 (setq articles (cdr articles))))))


@@ -1549,7 +1660,8 @@ password contained in '~/.nntp-authinfo'."
                 ;; article number.  How... helpful.
                 (progn
                   (forward-line 1)
                 ;; article number.  How... helpful.
                 (progn
                   (forward-line 1)

-                  (looking-at "[0-9]+\t...")) ; More text after number.
+                  ;; More text after number, or a dot.
+                  (looking-at "[0-9]+\t...\\|\\.\r?\n"))

                 (setq nntp-server-xover (car commands))))
          (setq commands (cdr commands)))
        ;; If none of the commands worked, we disable XOVER.
                 (setq nntp-server-xover (car commands))))
          (setq commands (cdr commands)))
        ;; If none of the commands worked, we disable XOVER.


@@ -1567,7 +1679,7 @@ password contained in '~/.nntp-authinfo'."
       (goto-char (point-min))
       ;; We first find the number by looking at the status line.
       (let ((number (and (looking-at "2[0-9][0-9] +\\([0-9]+\\) ")
       (goto-char (point-min))
       ;; We first find the number by looking at the status line.
       (let ((number (and (looking-at "2[0-9][0-9] +\\([0-9]+\\) ")

-                        (string-to-int
+                        (string-to-number

                          (buffer-substring (match-beginning 1)
                                            (match-end 1)))))
            newsgroups xref)
                          (buffer-substring (match-beginning 1)
                                            (match-end 1)))))
            newsgroups xref)


@@ -1598,14 +1710,15 @@ password contained in '~/.nntp-authinfo'."
                    (match-string 1 xref))
                   (t "")))
          (cond
                    (match-string 1 xref))
                   (t "")))
          (cond

-          ((and (setq xref (mail-fetch-field "xref"))
+          ((and (not nntp-xref-number-is-evil)
+                (setq xref (mail-fetch-field "xref"))

                 (string-match
                  (if group
                      (concat "\\(" (regexp-quote group) "\\):\\([0-9]+\\)")
                    "\\([^ :]+\\):\\([0-9]+\\)")
                  xref))
            (setq group (match-string 1 xref)
                 (string-match
                  (if group
                      (concat "\\(" (regexp-quote group) "\\):\\([0-9]+\\)")
                    "\\([^ :]+\\):\\([0-9]+\\)")
                  xref))
            (setq group (match-string 1 xref)

-                 number (string-to-int (match-string 2 xref))))
+                 number (string-to-number (match-string 2 xref))))

           ((and (setq newsgroups
                       (mail-fetch-field "newsgroups"))
                 (not (string-match "," newsgroups)))
           ((and (setq newsgroups
                       (mail-fetch-field "newsgroups"))
                 (not (string-match "," newsgroups)))


@@ -1815,8 +1928,8 @@ Please refer to the following variables to customize the connection:
 - `nntp-via-rlogin-command-switches',
 - `nntp-via-user-name',
 - `nntp-via-address',
 - `nntp-via-rlogin-command-switches',
 - `nntp-via-user-name',
 - `nntp-via-address',

-- `nntp-netcat-command',
-- `nntp-netcat-switches',
+- `nntp-via-netcat-command',
+- `nntp-via-netcat-switches',

 - `nntp-address',
 - `nntp-port-number',
 - `nntp-end-of-line'."
 - `nntp-address',
 - `nntp-port-number',
 - `nntp-end-of-line'."


@@ -1828,8 +1941,8 @@ Please refer to the following variables to customize the connection:
                   ,@(when nntp-via-user-name
                       (list "-l" nntp-via-user-name))
                   ,nntp-via-address
                   ,@(when nntp-via-user-name
                       (list "-l" nntp-via-user-name))
                   ,nntp-via-address

-                  ,nntp-netcat-command
-                  ,@nntp-netcat-switches
+                  ,nntp-via-netcat-command
+                  ,@nntp-via-netcat-switches

                   ,nntp-address
                   ,nntp-port-number)))
     (apply 'start-process "nntpd" buffer command)))
                   ,nntp-address
                   ,nntp-port-number)))
     (apply 'start-process "nntpd" buffer command)))


@@ -1909,6 +2022,97 @@ Please refer to the following variables to customize the connection:
        (delete-region (point) (point-max)))
       proc)))
 
        (delete-region (point) (point-max)))
       proc)))
 

+;; Marks handling
+
+(defun nntp-marks-directory (server)
+  (expand-file-name server nntp-marks-directory))
+
+(defvar nntp-server-to-method-cache nil
+  "Alist of servers and select methods.")
+
+(defun nntp-group-pathname (server group &optional file)
+  "Return an absolute file name of FILE for GROUP on SERVER."
+  (let ((method (cdr (assoc server nntp-server-to-method-cache))))
+    (unless method
+      (push (cons server (setq method (or (gnus-server-to-method server)
+                                         (gnus-find-method-for-group group))))
+           nntp-server-to-method-cache))
+    (nnmail-group-pathname
+     (mm-decode-coding-string group
+                             (inline (gnus-group-name-charset method group)))
+     (nntp-marks-directory server)
+     file)))
+
+(defun nntp-possibly-create-directory (group server)
+  (let ((dir (nntp-group-pathname server group))
+       (file-name-coding-system nnmail-pathname-coding-system))
+    (unless (file-exists-p dir)
+      (make-directory (directory-file-name dir) t)
+      (nnheader-message 5 "Creating nntp marks directory %s" dir))))
+
+(eval-and-compile
+  (autoload 'time-less-p "time-date"))
+
+(defun nntp-marks-changed-p (group server)
+  (let ((file (nntp-group-pathname server group nntp-marks-file-name))
+       (file-name-coding-system nnmail-pathname-coding-system))
+    (if (null (gnus-gethash file nntp-marks-modtime))
+       t ;; never looked at marks file, assume it has changed
+      (time-less-p (gnus-gethash file nntp-marks-modtime)
+                  (nth 5 (file-attributes file))))))
+
+(defun nntp-save-marks (group server)
+  (let ((file-name-coding-system nnmail-pathname-coding-system)
+       (file (nntp-group-pathname server group nntp-marks-file-name)))
+    (condition-case err
+       (progn
+         (nntp-possibly-create-directory group server)
+         (with-temp-file file
+           (erase-buffer)
+           (gnus-prin1 nntp-marks)
+           (insert "\n"))
+         (gnus-sethash file
+                       (nth 5 (file-attributes file))
+                       nntp-marks-modtime))
+      (error (or (gnus-yes-or-no-p
+                 (format "Could not write to %s (%s).  Continue? " file err))
+                (error "Cannot write to %s (%s)" file err))))))
+
+(defun nntp-open-marks (group server)
+  (let ((file (nntp-group-pathname server group nntp-marks-file-name))
+       (file-name-coding-system nnmail-pathname-coding-system))
+    (if (file-exists-p file)
+       (condition-case err
+           (with-temp-buffer
+             (gnus-sethash file (nth 5 (file-attributes file))
+                           nntp-marks-modtime)
+             (nnheader-insert-file-contents file)
+             (setq nntp-marks (read (current-buffer)))
+             (dolist (el gnus-article-unpropagated-mark-lists)
+               (setq nntp-marks (gnus-remassoc el nntp-marks))))
+         (error (or (gnus-yes-or-no-p
+                     (format "Error reading nntp marks file %s (%s).  Continuing will use marks from .newsrc.eld.  Continue? " file err))
+                    (error "Cannot read nntp marks file %s (%s)" file err))))
+      ;; User didn't have a .marks file.  Probably first time
+      ;; user of the .marks stuff.  Bootstrap it from .newsrc.eld.
+      (let ((info (gnus-get-info
+                  (gnus-group-prefixed-name
+                   group
+                   (gnus-server-to-method (format "nntp:%s" server)))))
+           (decoded-name (mm-decode-coding-string
+                          group
+                          (gnus-group-name-charset
+                           (gnus-server-to-method server) group))))
+       (nnheader-message 7 "Bootstrapping marks for %s..." decoded-name)
+       (setq nntp-marks (gnus-info-marks info))
+       (push (cons 'read (gnus-info-read info)) nntp-marks)
+       (dolist (el gnus-article-unpropagated-mark-lists)
+         (setq nntp-marks (gnus-remassoc el nntp-marks)))
+       (nntp-save-marks group server)
+       (nnheader-message 7 "Bootstrapping marks for %s...done"
+                         decoded-name)))))
+

 (provide 'nntp)
 
 (provide 'nntp)
 

+;;; arch-tag: 8655466a-b1b5-4929-9c45-7b1b2e767271

 ;;; nntp.el ends here
 ;;; nntp.el ends here