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

[Juanma Barranquero]

Index: emacs/lisp/gnus/gnus-agent.el
diff -c emacs/lisp/gnus/gnus-agent.el:1.6 emacs/lisp/gnus/gnus-agent.el:1.7
*** emacs/lisp/gnus/gnus-agent.el:1.6   Wed Jan 15 20:19:02 2003
--- emacs/lisp/gnus/gnus-agent.el       Tue Feb  4 08:06:38 2003
***************
*** 393,402 ****
    (save-restriction
      (message-narrow-to-headers)
      (let* ((gcc (mail-fetch-field "gcc" nil t))
!          (methods (and gcc 
                         (mapcar 'gnus-inews-group-method
                                 (message-unquote-tokens
!                                 (message-tokenize-header 
                                   gcc " ,")))))
           covered)
        (while (and (not covered) methods)
--- 393,402 ----
    (save-restriction
      (message-narrow-to-headers)
      (let* ((gcc (mail-fetch-field "gcc" nil t))
!          (methods (and gcc
                         (mapcar 'gnus-inews-group-method
                                 (message-unquote-tokens
!                                 (message-tokenize-header
                                   gcc " ,")))))
           covered)
        (while (and (not covered) methods)
***************
*** 513,519 ****
    (when (or (and gnus-agent-synchronize-flags
                 (not (eq gnus-agent-synchronize-flags 'ask)))
            (and (eq gnus-agent-synchronize-flags 'ask)
!                (gnus-y-or-n-p (format "Synchronize flags on server `%s'? " 
                                        (cadr method)))))
      (gnus-agent-synchronize-flags-server method)))
  
--- 513,519 ----
    (when (or (and gnus-agent-synchronize-flags
                 (not (eq gnus-agent-synchronize-flags 'ask)))
            (and (eq gnus-agent-synchronize-flags 'ask)
!                (gnus-y-or-n-p (format "Synchronize flags on server `%s'? "
                                        (cadr method)))))
      (gnus-agent-synchronize-flags-server method)))
  
***************
*** 702,708 ****
        (gnus-make-directory (file-name-directory file))
        (with-temp-file file
        ;; Emacs got problem to match non-ASCII group in multibyte buffer.
!       (mm-disable-multibyte) 
        (when (file-exists-p file)
          (nnheader-insert-file-contents file))
        (goto-char (point-min))
--- 702,708 ----
        (gnus-make-directory (file-name-directory file))
        (with-temp-file file
        ;; Emacs got problem to match non-ASCII group in multibyte buffer.
!       (mm-disable-multibyte)
        (when (file-exists-p file)
          (nnheader-insert-file-contents file))
        (goto-char (point-min))
***************
*** 730,736 ****
      (nnheader-translate-file-chars
       (nnheader-replace-chars-in-string
        (nnheader-replace-duplicate-chars-in-string
!        (nnheader-replace-chars-in-string 
        (gnus-group-real-name group)
        ?/ ?_)
         ?. ?_)
--- 730,736 ----
      (nnheader-translate-file-chars
       (nnheader-replace-chars-in-string
        (nnheader-replace-duplicate-chars-in-string
!        (nnheader-replace-chars-in-string
        (gnus-group-real-name group)
        ?/ ?_)
         ?. ?_)
***************
*** 847,854 ****
          (with-temp-buffer
            (let (article)
              (while (setq article (pop articles))
!               (when (or 
!                      (gnus-backlog-request-article group article 
                                                     nntp-server-buffer)
                       (gnus-request-article article group))
                  (goto-char (point-max))
--- 847,854 ----
          (with-temp-buffer
            (let (article)
              (while (setq article (pop articles))
!               (when (or
!                      (gnus-backlog-request-article group article
                                                     nntp-server-buffer)
                       (gnus-request-article article group))
                  (goto-char (point-max))
***************
*** 1103,1113 ****
                  (while (setq group (pop groups))
                    (when (<= (gnus-group-level group) gnus-agent-handle-level)
                      (gnus-agent-fetch-group-1 group gnus-command-method))))))
!         (error 
           (unless (funcall gnus-agent-confirmation-function
                            (format "Error (%s).  Continue? " err))
             (error "Cannot fetch articles into the Gnus agent")))
!         (quit 
           (unless (funcall gnus-agent-confirmation-function
                            (format "Quit (%s).  Continue? " err))
             (signal 'quit "Cannot fetch articles into the Gnus agent."))))
--- 1103,1113 ----
                  (while (setq group (pop groups))
                    (when (<= (gnus-group-level group) gnus-agent-handle-level)
                      (gnus-agent-fetch-group-1 group gnus-command-method))))))
!         (error
           (unless (funcall gnus-agent-confirmation-function
                            (format "Error (%s).  Continue? " err))
             (error "Cannot fetch articles into the Gnus agent")))
!         (quit
           (unless (funcall gnus-agent-confirmation-function
                            (format "Quit (%s).  Continue? " err))
             (signal 'quit "Cannot fetch articles into the Gnus agent."))))
***************
*** 1138,1144 ****
                 (setq gnus-newsgroup-dependencies
                       (make-vector (length articles) 0))
                 (setq gnus-newsgroup-headers
!                      (gnus-get-newsgroup-headers-xover articles nil nil 
                                                         group))
                 ;; `gnus-agent-overview-buffer' may be killed for
                 ;; timeout reason.  If so, recreate it.
--- 1138,1144 ----
                 (setq gnus-newsgroup-dependencies
                       (make-vector (length articles) 0))
                 (setq gnus-newsgroup-headers
!                      (gnus-get-newsgroup-headers-xover articles nil nil
                                                         group))
                 ;; `gnus-agent-overview-buffer' may be killed for
                 ;; timeout reason.  If so, recreate it.
***************
*** 1532,1538 ****
        (when (file-exists-p (gnus-agent-lib-file "active"))
          (with-temp-buffer
            (nnheader-insert-file-contents (gnus-agent-lib-file "active"))
!           (gnus-active-to-gnus-format 
             gnus-command-method
             (setq orig (gnus-make-hashtable
                         (count-lines (point-min) (point-max))))))
--- 1532,1538 ----
        (when (file-exists-p (gnus-agent-lib-file "active"))
          (with-temp-buffer
            (nnheader-insert-file-contents (gnus-agent-lib-file "active"))
!           (gnus-active-to-gnus-format
             gnus-command-method
             (setq orig (gnus-make-hashtable
                         (count-lines (point-min) (point-max))))))
***************
*** 1598,1604 ****
                                 (or (not (numberp
                                           (setq art (read (current-buffer)))))
                                     (< art article)))
!                      (if (and (numberp art) 
                                (file-exists-p
                                 (gnus-agent-article-name
                                  (number-to-string art) group)))
--- 1598,1604 ----
                                 (or (not (numberp
                                           (setq art (read (current-buffer)))))
                                     (< art article)))
!                      (if (and (numberp art)
                                (file-exists-p
                                 (gnus-agent-article-name
                                  (number-to-string art) group)))