projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pop3.el (pop3-open-server, pop3-read-response, pop3-list, pop3-retr, pop3-quit):...
[gnus]
/
lisp
/
mm-partial.el
diff --git
a/lisp/mm-partial.el
b/lisp/mm-partial.el
index
d05283c
..
6509b64
100644
(file)
--- a/
lisp/mm-partial.el
+++ b/
lisp/mm-partial.el
@@
-1,40
+1,38
@@
;;; mm-partial.el --- showing message/partial
;;; mm-partial.el --- showing message/partial
-;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: message partial
;; This file is part of GNU Emacs.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: message partial
;; This file is part of GNU Emacs.
-;; 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 you
r
-;; option) any later version.
+;; 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 3 of the License, o
r
+;;
(at your
option) any later version.
-;; GNU Emacs is distributed in the hope that it will be useful,
but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU
-;; General Public License for more details.
+;; GNU Emacs is distributed in the hope that it will be useful,
+;;
but
WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; G
NU G
eneral Public License for more details.
;; You should have received a copy of the GNU General Public License
;; 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, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Code:
;;; Commentary:
;;; Code:
-(eval-when-compile
- (require 'cl))
+(eval-when-compile (require 'cl))
(require 'gnus-sum)
(require 'mm-util)
(require 'mm-decode)
(defun mm-partial-find-parts (id &optional art)
(require 'gnus-sum)
(require 'mm-util)
(require 'mm-decode)
(defun mm-partial-find-parts (id &optional art)
- (let ((headers (save-excursion
- (set-buffer gnus-summary-buffer)
+ (let ((headers (with-current-buffer gnus-summary-buffer
gnus-newsgroup-headers))
phandles header)
(while (setq header (pop headers))
gnus-newsgroup-headers))
phandles header)
(while (setq header (pop headers))
@@
-43,7
+41,8
@@
(gnus-request-article-this-buffer (aref header 0)
gnus-newsgroup-name)
(when (search-forward id nil t)
(gnus-request-article-this-buffer (aref header 0)
gnus-newsgroup-name)
(when (search-forward id nil t)
- (let ((nhandles (mm-dissect-buffer)) nid)
+ (let ((nhandles (mm-dissect-buffer
+ nil gnus-article-loose-mime)) nid)
(if (consp (car nhandles))
(mm-destroy-parts nhandles)
(setq nid (cdr (assq 'id
(if (consp (car nhandles))
(mm-destroy-parts nhandles)
(setq nid (cdr (assq 'id
@@
-66,13
+65,12
@@
If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
gnus-displaying-mime handles buffer)
(unless (mm-handle-cache handle)
(unless id
gnus-displaying-mime handles buffer)
(unless (mm-handle-cache handle)
(unless id
- (error "Can not find message/partial id
.
"))
+ (error "Can not find message/partial id"))
(setq phandles
(sort (cons handle
(mm-partial-find-parts
id
(setq phandles
(sort (cons handle
(mm-partial-find-parts
id
- (save-excursion
- (set-buffer gnus-summary-buffer)
+ (with-current-buffer gnus-summary-buffer
(gnus-summary-article-number))))
#'(lambda (a b)
(let ((anumber (string-to-number
(gnus-summary-article-number))))
#'(lambda (a b)
(let ((anumber (string-to-number
@@
-84,8
+82,7
@@
If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
(< anumber bnumber)))))
(setq gnus-article-mime-handles
(mm-merge-handles gnus-article-mime-handles phandles))
(< anumber bnumber)))))
(setq gnus-article-mime-handles
(mm-merge-handles gnus-article-mime-handles phandles))
- (save-excursion
- (set-buffer (generate-new-buffer " *mm*"))
+ (with-current-buffer (generate-new-buffer " *mm*")
(while (setq phandle (pop phandles))
(setq nn (string-to-number
(cdr (assq 'number
(while (setq phandle (pop phandles))
(setq nn (string-to-number
(cdr (assq 'number
@@
-96,7
+93,7
@@
If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
(if ntotal
(if total
(unless (eq total ntotal)
(if ntotal
(if total
(unless (eq total ntotal)
- (error "The numbers of total are different
.
"))
+ (error "The numbers of total are different"))
(setq total ntotal)))
(unless (< nn n)
(unless (eq nn n)
(setq total ntotal)))
(unless (< nn n)
(unless (eq nn n)
@@
-149,4
+146,6
@@
If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
(error nil))
(delete-region ,(point-min-marker) ,(point-max-marker))))))))))
(error nil))
(delete-region ,(point-min-marker) ,(point-max-marker))))))))))
-;; mm-partial.el ends here
+(provide 'mm-partial)
+
+;;; mm-partial.el ends here