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

[Miles Bader]

Index: emacs/lisp/gnus/mm-partial.el
diff -c emacs/lisp/gnus/mm-partial.el:1.3 emacs/lisp/gnus/mm-partial.el:1.4
*** emacs/lisp/gnus/mm-partial.el:1.3   Sun Jul 15 13:42:53 2001
--- emacs/lisp/gnus/mm-partial.el       Tue Feb  4 08:06:38 2003
***************
*** 25,31 ****
  
  ;;; Code:
  
! (eval-when-compile 
    (require 'cl))
  
  (require 'gnus-sum)
--- 25,31 ----
  
  ;;; Code:
  
! (eval-when-compile
    (require 'cl))
  
  (require 'gnus-sum)
***************
*** 40,52 ****
      (while (setq header (pop headers))
        (unless (eq (aref header 0) art)
        (mm-with-unibyte-buffer
!         (gnus-request-article-this-buffer (aref header 0) 
                                            gnus-newsgroup-name)
          (when (search-forward id nil t)
            (let ((nhandles (mm-dissect-buffer)) nid)
              (if (consp (car nhandles))
                  (mm-destroy-parts nhandles)
!               (setq nid (cdr (assq 'id 
                                     (cdr (mm-handle-type nhandles)))))
                (if (not (equal id nid))
                    (mm-destroy-parts nhandles)
--- 40,52 ----
      (while (setq header (pop headers))
        (unless (eq (aref header 0) art)
        (mm-with-unibyte-buffer
!         (gnus-request-article-this-buffer (aref header 0)
                                            gnus-newsgroup-name)
          (when (search-forward id nil t)
            (let ((nhandles (mm-dissect-buffer)) nid)
              (if (consp (car nhandles))
                  (mm-destroy-parts nhandles)
!               (setq nid (cdr (assq 'id
                                     (cdr (mm-handle-type nhandles)))))
                (if (not (equal id nid))
                    (mm-destroy-parts nhandles)
***************
*** 56,65 ****
  ;;;###autoload
  (defun mm-inline-partial (handle &optional no-display)
    "Show the partial part of HANDLE.
! This function replaces the buffer of HANDLE with a buffer contains 
  the entire message.
  If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
!   (let ((id (cdr (assq 'id (cdr (mm-handle-type handle))))) 
        phandles
        (b (point)) (n 1) total
        phandle nn ntotal
--- 56,65 ----
  ;;;###autoload
  (defun mm-inline-partial (handle &optional no-display)
    "Show the partial part of HANDLE.
! This function replaces the buffer of HANDLE with a buffer contains
  the entire message.
  If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
!   (let ((id (cdr (assq 'id (cdr (mm-handle-type handle)))))
        phandles
        (b (point)) (n 1) total
        phandle nn ntotal
***************
*** 68,85 ****
        (unless id
        (error "Can not find message/partial id"))
        (setq phandles
!           (sort (cons handle 
                        (mm-partial-find-parts
!                        id 
                         (save-excursion
                           (set-buffer gnus-summary-buffer)
                           (gnus-summary-article-number))))
                  #'(lambda (a b)
!                     (let ((anumber (string-to-number 
!                                     (cdr (assq 'number 
                                                 (cdr (mm-handle-type a))))))
!                           (bnumber (string-to-number 
!                                     (cdr (assq 'number 
                                                 (cdr (mm-handle-type b)))))))
                        (< anumber bnumber)))))
        (setq gnus-article-mime-handles
--- 68,85 ----
        (unless id
        (error "Can not find message/partial id"))
        (setq phandles
!           (sort (cons handle
                        (mm-partial-find-parts
!                        id
                         (save-excursion
                           (set-buffer gnus-summary-buffer)
                           (gnus-summary-article-number))))
                  #'(lambda (a b)
!                     (let ((anumber (string-to-number
!                                     (cdr (assq 'number
                                                 (cdr (mm-handle-type a))))))
!                           (bnumber (string-to-number
!                                     (cdr (assq 'number
                                                 (cdr (mm-handle-type b)))))))
                        (< anumber bnumber)))))
        (setq gnus-article-mime-handles
***************
*** 90,104 ****
        (save-excursion
        (set-buffer (generate-new-buffer " *mm*"))
        (while (setq phandle (pop phandles))
!         (setq nn (string-to-number 
!                   (cdr (assq 'number 
                               (cdr (mm-handle-type phandle))))))
!         (setq ntotal (string-to-number 
!                       (cdr (assq 'total 
                                   (cdr (mm-handle-type phandle))))))
          (if ntotal
              (if total
!                 (unless (eq total ntotal) 
                  (error "The numbers of total are different"))
                (setq total ntotal)))
          (unless (< nn n)
--- 90,104 ----
        (save-excursion
        (set-buffer (generate-new-buffer " *mm*"))
        (while (setq phandle (pop phandles))
!         (setq nn (string-to-number
!                   (cdr (assq 'number
                               (cdr (mm-handle-type phandle))))))
!         (setq ntotal (string-to-number
!                       (cdr (assq 'total
                                   (cdr (mm-handle-type phandle))))))
          (if ntotal
              (if total
!                 (unless (eq total ntotal)
                  (error "The numbers of total are different"))
                (setq total ntotal)))
          (unless (< nn n)
***************
*** 134,140 ****
                  (nconc (if (listp (car gnus-article-mime-handles))
                           gnus-article-mime-handles
                           (list gnus-article-mime-handles))
!                        (if (listp (car handles)) 
                             handles (list handles)))))
          (mm-handle-set-undisplayer
           handle
--- 134,140 ----
                  (nconc (if (listp (car gnus-article-mime-handles))
                           gnus-article-mime-handles
                           (list gnus-article-mime-handles))
!                        (if (listp (car handles))
                             handles (list handles)))))
          (mm-handle-set-undisplayer
           handle