Mercurial > emacs
comparison lisp/gnus/mm-decode.el @ 112415:555faf6e40d0
mm-decode.el (mm-preferred-alternative-precedence): Don't bug out on nested related parts.
nnfolder.el (nnfolder-request-expire-articles): Return the list of unexpired articles. This fixes the regression that led expiry marks to disappear from nnfolder groups.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sat, 22 Jan 2011 12:34:50 +0000 |
| parents | 1b25cd6a6e36 |
| children | f60dc8d74215 |
comparison
equal
deleted
inserted
replaced
| 112414:4b27e6d58d2c | 112415:555faf6e40d0 |
|---|---|
| 1377 (dolist (handle (copy-sequence handles)) | 1377 (dolist (handle (copy-sequence handles)) |
| 1378 (when (string-match disc (mm-handle-media-type handle)) | 1378 (when (string-match disc (mm-handle-media-type handle)) |
| 1379 (setq handles (nconc (delete handle handles) (list handle)))))) | 1379 (setq handles (nconc (delete handle handles) (list handle)))))) |
| 1380 ;; Remove empty parts. | 1380 ;; Remove empty parts. |
| 1381 (dolist (handle (copy-sequence handles)) | 1381 (dolist (handle (copy-sequence handles)) |
| 1382 (unless (with-current-buffer (mm-handle-buffer handle) | 1382 (when (and (bufferp (mm-handle-buffer handle)) |
| 1383 (goto-char (point-min)) | 1383 (not (with-current-buffer (mm-handle-buffer handle) |
| 1384 (re-search-forward "[^ \t\n]" nil t)) | 1384 (goto-char (point-min)) |
| 1385 (re-search-forward "[^ \t\n]" nil t)))) | |
| 1385 (setq handles (nconc (delete handle handles) (list handle))))) | 1386 (setq handles (nconc (delete handle handles) (list handle))))) |
| 1386 (mapcar #'mm-handle-media-type handles)) | 1387 (mapcar #'mm-handle-media-type handles)) |
| 1387 | 1388 |
| 1388 (defun mm-get-content-id (id) | 1389 (defun mm-get-content-id (id) |
| 1389 "Return the handle(s) referred to by ID." | 1390 "Return the handle(s) referred to by ID." |