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

[Thien-Thi Nguyen]

Index: emacs/lisp/gnus/nntp.el
diff -c emacs/lisp/gnus/nntp.el:1.27 emacs/lisp/gnus/nntp.el:1.28
*** emacs/lisp/gnus/nntp.el:1.27        Tue Jul  5 00:35:10 2005
--- emacs/lisp/gnus/nntp.el     Sat Aug  6 19:51:42 2005
***************
*** 1,8 ****
  ;;; nntp.el --- nntp access for Gnus
  
! ;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996,
! ;; 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005
! ;;        Free Software Foundation, Inc.
  
  ;; Author: Lars Magne Ingebrigtsen <address@hidden>
  ;; Keywords: news
--- 1,8 ----
  ;;; nntp.el --- nntp access for Gnus
  
! ;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993,
! ;;   1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002,
! ;;   2003, 2004, 2005 Free Software Foundation, Inc.
  
  ;; Author: Lars Magne Ingebrigtsen <address@hidden>
  ;; Keywords: news
***************
*** 255,261 ****
  (defvar nntp-async-timer nil)
  (defvar nntp-async-process-list nil)
  
! (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
--- 255,261 ----
  (defvar nntp-async-timer nil)
  (defvar nntp-async-process-list nil)
  
! (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
***************
*** 889,895 ****
      (if (numberp article) (int-to-string article) article))))
  
  (deffoo nntp-request-group (group &optional server dont-check)
!   (nntp-with-open-group 
      nil server
      (when (nntp-send-command "^[245].*\n" "GROUP" group)
        (let ((entry (nntp-find-connection-entry nntp-server-buffer)))
--- 889,895 ----
      (if (numberp article) (int-to-string article) article))))
  
  (deffoo nntp-request-group (group &optional server dont-check)
!   (nntp-with-open-group
      nil server
      (when (nntp-send-command "^[245].*\n" "GROUP" group)
        (let ((entry (nntp-find-connection-entry nntp-server-buffer)))
***************
*** 1156,1165 ****
  
  (defun nntp-open-ssl-stream (buffer)
    (let* ((process-connection-type nil)
!        (proc (start-process "nntpd" buffer 
                              shell-file-name
                              shell-command-switch
!                             (format-spec nntp-ssl-program 
                                           (format-spec-make
                                            ?s nntp-address
                                            ?p nntp-port-number)))))
--- 1156,1165 ----
  
  (defun nntp-open-ssl-stream (buffer)
    (let* ((process-connection-type nil)
!        (proc (start-process "nntpd" buffer
                              shell-file-name
                              shell-command-switch
!                             (format-spec nntp-ssl-program
                                           (format-spec-make
                                            ?s nntp-address
                                            ?p nntp-port-number)))))
***************
*** 1317,1323 ****
      ;; 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"))))
  
--- 1317,1323 ----
      ;; 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"))))
  
***************
*** 1501,1507 ****
            (goto-char (point-min))
            (when (re-search-forward "^[0-9][0-9][0-9] .*\n\\([0-9]+\\)" nil t)
              (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))))))
--- 1501,1507 ----
            (goto-char (point-min))
            (when (re-search-forward "^[0-9][0-9][0-9] .*\n\\([0-9]+\\)" nil t)
              (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))))))