From 67e14be91eecc1581bc36f09bfe1bc6ed35ba93a Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 23 Jan 2002 04:36:50 +0000 Subject: [PATCH] * message.el: Require `base64' before `canlock-om' to avoid damage to define `base64-encode-string' by MEL. * dgnushack.el: Load base64.el before canlock-om.el to avoid damage to define `base64-encode-string' by MEL. * gnus-art.el (gnus-article-display-traditional-message): Use `set-buffer-multibyte'. * gnus-ja.texi (Using MIME): Remove `gnus-strict-mime'. * gnus.texi (Using MIME): Ditto. --- ChangeLog | 13 +++++++++++++ lisp/dgnushack.el | 4 ++++ lisp/gnus-art.el | 4 +++- lisp/message.el | 4 +++- texi/gnus-ja.texi | 5 +---- texi/gnus.texi | 9 +++------ 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a6817c..862c087 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2002-01-23 Katsumi Yamaoka + + * lisp/message.el: Require `base64' before `canlock-om' to avoid + damage to define `base64-encode-string' by MEL. + + * lisp/dgnushack.el: Load base64.el before canlock-om.el to avoid + damage to define `base64-encode-string' by MEL. + +2002-01-21 ARISAWA Akihiro + + * lisp/gnus-art.el (gnus-article-display-traditional-message): Use + `set-buffer-multibyte'. + 2002-01-21 Katsumi Yamaoka * lisp/gnus-vers.el: T-gnus 6.15.5 revision 02 (merged diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index a8fa065..8f51880 100644 --- a/lisp/dgnushack.el +++ b/lisp/dgnushack.el @@ -226,6 +226,10 @@ Try to re-configure with --with-addpath=FLIM_PATH and run make again. (load (expand-file-name "gnus-clfns.el" srcdir) nil t t) (when (boundp 'MULE) + ;; Bind the function `base64-encode-string' before loading canlock. + ;; Since canlock will bind it as an autoloaded function, it causes + ;; damage to define the function by MEL. + (load (expand-file-name "base64.el" srcdir) nil t t) ;; Load special macros for compiling canlock.el. (load (expand-file-name "canlock-om.el" srcdir) nil t t)) diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index b5ca7d8..b05f35a 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -3628,7 +3628,9 @@ commands: (set-buffer gnus-article-buffer) (let (buffer-read-only) (erase-buffer) - (insert-buffer-substring gnus-original-article-buffer))) + (set-buffer-multibyte nil) + (insert-buffer-substring gnus-original-article-buffer) + (set-buffer-multibyte t))) (defun gnus-article-make-full-mail-header (&optional number charset) "Create a new mail header structure in a raw article buffer." diff --git a/lisp/message.el b/lisp/message.el index b438468..1bd98b8 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -42,7 +42,9 @@ (defvar gnus-list-identifiers)) ; gnus-sum is required where necessary (eval-and-compile (if (boundp 'MULE) - (require 'canlock-om) + (progn + (require 'base64) + (require 'canlock-om)) (require 'canlock))) (require 'mailheader) (require 'nnheader) diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 246ccb5..7c8b4a9 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -9622,7 +9622,6 @@ Gnus $B$O%X%C%@!<$NJB$YBX$((B(sort)$B$b9T$$$^$9(B ($B$3$l$O%G%#%U%)%k%H$G9T @vindex gnus-show-mime @vindex gnus-article-display-method-for-mime -@vindex gnus-strict-mime @findex gnus-article-display-mime-message Gnus $B$O(B @code{gnus-article-display-method-for-mime} $B$K5-;v$r2!$7IU$1$k$3(B $B$H$G(B @sc{mime} $B$r07$$$^$9!#$3$N=i4|CM(B @@ -9632,9 +9631,7 @@ SEMI MIME-View $B$K4X$9$k>\$7$$>pJs$O!"%^%K%e%"%k$r;2>H$7$F$/$@$5$$(B ($B$^$@ $B$J$$$1$I(B (;_;))$B!#(B @sc{mime} $B$r>o$K;HMQ$7$?$1$l$P!"(B -@code{gnus-show-mime} $B$r(B @code{t} $B$K@_Dj$7$F$/$@$5$$!#$7$+$7!"(B -@code{gnus-strict-mime} $B$,(B @code{nil} $B0J30$G$"$l$P!"(B@sc{mime} $B=hM}$O5-;v(B -$BCf$K(B @sc{mime} $B%X%C%@!<$,$"$k$H$-$N$_;HMQ$5$l$^$9!#(B +@code{gnus-show-mime} $B$r(B @code{t} $B$K@_Dj$7$F$/$@$5$$!#(B @code{gnus-show-mime} $B$r@_Dj$7$F$$$k$H!"1?$,0-$$$H5-;v%P%C%U%!$K$O8N>c$7(B $B$?$h$&$J2hLL$,8+$($k$3$H$b$"$k$G$7$g$&!#$3$l$OHr$1$h$&$,$"$j$^$;$s!#(B diff --git a/texi/gnus.texi b/texi/gnus.texi index e4de15b..c06120b 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -10103,7 +10103,6 @@ other naughty stuff in innocent-looking articles. @vindex gnus-show-mime @vindex gnus-article-display-method-for-mime -@vindex gnus-strict-mime @findex gnus-article-display-mime-message Gnus handles @sc{mime} by pushing the articles through @code{gnus-article-display-method-for-mime}, which is @@ -10113,11 +10112,9 @@ information on SEMI MIME-View, see its manual page (however it is not existed yet, sorry). Set @code{gnus-show-mime} to @code{t} if you want to use -@sc{mime} all the time. However, if @code{gnus-strict-mime} is -non-@code{nil}, the @sc{mime} method will only be used if there are -@sc{mime} headers in the article. If you have @code{gnus-show-mime} -set, then you'll see some unfortunate display glitches in the article -buffer. These can't be avoided. +@sc{mime} all the time. If you have @code{gnus-show-mime} set, then +you'll see some unfortunate display glitches in the article buffer. +These can't be avoided. In GNUS or Gnus, it might be best to just use the toggling functions from the summary buffer to avoid getting nasty surprises. (For instance, -- 1.7.10.4