From 3fe75a6d654b4efab1e7f36262af00886f59ddbc Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 26 Jul 2001 22:10:09 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 15 +++++++++++++++ lisp/mm-decode.el | 13 ++++++++++++- lisp/nnheader.el | 2 +- lisp/nnimap.el | 2 +- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9ff6eaa..fcb2ae6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2001-07-26 14:00:00 ShengHuo ZHU + + * mm-decode.el (mm-readable-p): New. + (mm-inline-media-tests): Fix the default testers. + +2001-07-26 Simon Josefsson + + * nnimap.el (nnimap-version): Bump version number. + +2001-07-26 10:00:00 ShengHuo ZHU + From Steven E. Harris + + * nnheader.el (nnheader-translate-file-chars): cygwin32 is running + in M$Windows too. + 2001-07-26 Kai Gro,A_(Bjohann * gnus-delay.el (gnus-delay-send-drafts): Don't `error'. diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index 236692a..fd09498 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -180,8 +180,11 @@ ("multipart/alternative" ignore identity) ("multipart/mixed" ignore identity) ("multipart/related" ignore identity) + ;; Disable audio and image + ("audio/.*" ignore ignore) + ("image/.*" ignore ignore) ;; Default to displaying as text - (".*" mm-inline-text identity)) + (".*" mm-inline-text mm-readable-p)) "Alist of media types/tests saying whether types can be displayed inline." :type '(repeat (list (string :tag "MIME type") (function :tag "Display function") @@ -1261,6 +1264,14 @@ If RECURSIVE, search recursively." handles2 (list handles2)))) +(defun mm-readable-p (handle) + "Say whether the content of HANDLE is readable." + (and (< (buffer-size (mm-handle-buffer handle)) 10000) + (mm-with-unibyte-buffer + (mm-insert-part handle) + (and (eq (mm-body-7-or-8) '7bit) + (not (mm-long-lines-p 76)))))) + (provide 'mm-decode) ;;; mm-decode.el ends here diff --git a/lisp/nnheader.el b/lisp/nnheader.el index 9ece447..1fe79ca 100644 --- a/lisp/nnheader.el +++ b/lisp/nnheader.el @@ -871,7 +871,7 @@ If FULL, translate everything." ;; We translate -- but only the file name. We leave the directory ;; alone. (if (and (featurep 'xemacs) - (memq system-type '(win32 w32 mswindows windows-nt))) + (memq system-type '(cygwin32 win32 w32 mswindows windows-nt))) ;; This is needed on NT and stuff, because ;; file-name-nondirectory is not enough to split ;; file names, containing ':', e.g. diff --git a/lisp/nnimap.el b/lisp/nnimap.el index 2e2fb81..ea188f4 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -72,7 +72,7 @@ (nnoo-declare nnimap) -(defconst nnimap-version "nnimap 0.131") +(defconst nnimap-version "nnimap 1.0") (defvoo nnimap-address nil "Address of physical IMAP server. If nil, use the virtual server's name.") -- 1.7.10.4