[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-int.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/gnus/gnus-int.el
diff -c emacs/lisp/gnus/gnus-int.el:1.7.6.3 emacs/lisp/gnus/gnus-int.el:1.7.6.4
*** emacs/lisp/gnus/gnus-int.el:1.7.6.3 Tue Sep 21 09:34:07 2004
--- emacs/lisp/gnus/gnus-int.el Fri Oct 22 10:13:32 2004
***************
*** 33,38 ****
--- 33,39 ----
  (require 'gnus-range)
  
  (autoload 'gnus-agent-expire "gnus-agent")
+ (autoload 'gnus-agent-regenerate-group "gnus-agent")
  (autoload 'gnus-agent-read-servers-validate-native "gnus-agent")
  
  (defcustom gnus-open-server-hook nil
***************
*** 176,182 ****
      (setq method (gnus-server-to-method method)))
    ;; Check cache of constructed names.
    (let* ((method-sym (if gnus-agent
!                        (gnus-agent-get-function method)
                       (car method)))
         (method-fns (get method-sym 'gnus-method-functions))
         (func (let ((method-fnlist-elt (assq function method-fns)))
--- 177,183 ----
      (setq method (gnus-server-to-method method)))
    ;; Check cache of constructed names.
    (let* ((method-sym (if gnus-agent
!                        (inline (gnus-agent-get-function method))
                       (car method)))
         (method-fns (get method-sym 'gnus-method-functions))
         (func (let ((method-fnlist-elt (assq function method-fns)))
***************
*** 570,576 ****
                          (nth 1 gnus-command-method) accept-function last)))
      (when (and result gnus-agent
               (gnus-agent-method-p gnus-command-method))
!       (gnus-agent-expire (list article) group 'force))
      result))
      
  (defun gnus-request-accept-article (group &optional gnus-command-method last
--- 571,577 ----
                          (nth 1 gnus-command-method) accept-function last)))
      (when (and result gnus-agent
               (gnus-agent-method-p gnus-command-method))
!       (gnus-agent-unfetch-articles group (list article)))
      result))
      
  (defun gnus-request-accept-article (group &optional gnus-command-method last
***************
*** 580,586 ****
      (setq gnus-command-method (gnus-server-to-method gnus-command-method)))
    (when (and (not gnus-command-method)
             (stringp group))
!     (setq gnus-command-method (gnus-group-name-to-method group)))
    (goto-char (point-max))
    (unless (bolp)
      (insert "\n"))
--- 581,588 ----
      (setq gnus-command-method (gnus-server-to-method gnus-command-method)))
    (when (and (not gnus-command-method)
             (stringp group))
!     (setq gnus-command-method (or (gnus-find-method-for-group group)
!                                   (gnus-group-name-to-method group))))
    (goto-char (point-max))
    (unless (bolp)
      (insert "\n"))
***************
*** 592,603 ****
        (let ((mail-parse-charset message-default-charset))
          (mail-encode-encoded-word-buffer)))
        (message-encode-message-body)))
!   (let ((gnus-command-method (or gnus-command-method
!                                (gnus-find-method-for-group group))))
!     (funcall (gnus-get-function gnus-command-method 'request-accept-article)
!            (if (stringp group) (gnus-group-real-name group) group)
!            (cadr gnus-command-method)
!            last)))
  
  (defun gnus-request-replace-article (article group buffer &optional no-encode)
    (unless no-encode
--- 594,610 ----
        (let ((mail-parse-charset message-default-charset))
          (mail-encode-encoded-word-buffer)))
        (message-encode-message-body)))
! (let ((gnus-command-method (or gnus-command-method
!                                (gnus-find-method-for-group group)))
!       (result 
!        (funcall 
!         (gnus-get-function gnus-command-method 'request-accept-article)
!         (if (stringp group) (gnus-group-real-name group) group)
!         (cadr gnus-command-method)
!         last)))
!     (when (and gnus-agent (gnus-agent-method-p gnus-command-method))
!       (gnus-agent-regenerate-group group (list (cdr result))))
!     result))
  
  (defun gnus-request-replace-article (article group buffer &optional no-encode)
    (unless no-encode
***************
*** 608,616 ****
        (let ((mail-parse-charset message-default-charset))
          (mail-encode-encoded-word-buffer)))
        (message-encode-message-body)))
!   (let ((func (car (gnus-group-name-to-method group))))
!     (funcall (intern (format "%s-request-replace-article" func))
!            article (gnus-group-real-name group) buffer)))
  
  (defun gnus-request-associate-buffer (group)
    (let ((gnus-command-method (gnus-find-method-for-group group)))
--- 615,626 ----
        (let ((mail-parse-charset message-default-charset))
          (mail-encode-encoded-word-buffer)))
        (message-encode-message-body)))
!   (let* ((func (car (gnus-group-name-to-method group)))
!          (result (funcall (intern (format "%s-request-replace-article" func))
!                         article (gnus-group-real-name group) buffer)))
!     (when (and gnus-agent (gnus-agent-method-p gnus-command-method))
!       (gnus-agent-regenerate-group group (list article)))
!     result))
  
  (defun gnus-request-associate-buffer (group)
    (let ((gnus-command-method (gnus-find-method-for-group group)))
***************
*** 633,647 ****
             (gnus-group-real-name group) (nth 1 gnus-command-method) args)))
  
  (defun gnus-request-delete-group (group &optional force)
!   (let ((gnus-command-method (gnus-find-method-for-group group)))
!     (funcall (gnus-get-function gnus-command-method 'request-delete-group)
!            (gnus-group-real-name group) force (nth 1 gnus-command-method))))
  
  (defun gnus-request-rename-group (group new-name)
!   (let ((gnus-command-method (gnus-find-method-for-group group)))
!     (funcall (gnus-get-function gnus-command-method 'request-rename-group)
!            (gnus-group-real-name group)
!            (gnus-group-real-name new-name) (nth 1 gnus-command-method))))
  
  (defun gnus-close-backends ()
    ;; Send a close request to all backends that support such a request.
--- 643,667 ----
             (gnus-group-real-name group) (nth 1 gnus-command-method) args)))
  
  (defun gnus-request-delete-group (group &optional force)
!   (let* ((gnus-command-method (gnus-find-method-for-group group))
!        (result
!         (funcall (gnus-get-function gnus-command-method 'request-delete-group)
!                  (gnus-group-real-name group) force (nth 1 
gnus-command-method))))
!     (when result
!       (gnus-cache-delete-group group)
!       (gnus-agent-delete-group group))
!     result))
  
  (defun gnus-request-rename-group (group new-name)
!   (let* ((gnus-command-method (gnus-find-method-for-group group))
!        (result
!         (funcall (gnus-get-function gnus-command-method 'request-rename-group)
!                  (gnus-group-real-name group)
!                  (gnus-group-real-name new-name) (nth 1 
gnus-command-method))))
!     (when result
!       (gnus-cache-rename-group group new-name)
!       (gnus-agent-rename-group group new-name))
!     result))
  
  (defun gnus-close-backends ()
    ;; Send a close request to all backends that support such a request.