From: yamaoka Date: Mon, 16 Nov 1998 01:43:37 +0000 (+0000) Subject: Importing Pterodactyl Gnus v0.48. X-Git-Tag: pgnus-0_48~1 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=f1978432e2f74cfd77f0ad0db0ce8e99b79003e6;p=elisp%2Fgnus.git- Importing Pterodactyl Gnus v0.48. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9123068..7eaac25 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,16 @@ +Mon Nov 16 02:00:05 1998 Lars Magne Ingebrigtsen + + * gnus.el: Pterodactyl Gnus v0.48 is released. + +1998-11-15 23:18:56 Lars Magne Ingebrigtsen + + * mm-bodies.el (mm-encode-body): Disbabled for nonmule. + + * mm-util.el (mm-find-charset-region): Bogus change for non-Mule. + + * message.el (message-cite-original-without-signature): Ditto. + (message-cite-original): Quote parts. + Sun Nov 15 22:01:55 1998 Lars Magne Ingebrigtsen * gnus.el: Pterodactyl Gnus v0.47 is released. diff --git a/lisp/gnus.el b/lisp/gnus.el index 327ca8a..dc02ea8 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -254,7 +254,7 @@ is restarted, and sometimes reloaded." :link '(custom-manual "(gnus)Exiting Gnus") :group 'gnus) -(defconst gnus-version-number "0.47" +(defconst gnus-version-number "0.48" "Version number for this version of Gnus.") (defconst gnus-version (format "Pterodactyl Gnus v%s" gnus-version-number) diff --git a/lisp/message.el b/lisp/message.el index 2864796..0c9a0f8 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -1812,6 +1812,11 @@ prefix, and don't delete any headers." (if (listp message-indent-citation-function) message-indent-citation-function (list message-indent-citation-function))))) + (goto-char start) + ;; Quote parts. + (while (re-search-forward "<#/?!*\\(multi\\|part\\)>" end t) + (goto-char (match-beginning 1)) + (insert "!")) (goto-char end) (when (re-search-backward "^-- $" start t) ;; Also peel off any blank lines before the signature. @@ -1835,12 +1840,18 @@ prefix, and don't delete any headers." mail-citation-hook) (run-hooks 'mail-citation-hook) (let ((start (point)) + (end (mark t)) (functions (when message-indent-citation-function (if (listp message-indent-citation-function) message-indent-citation-function (list message-indent-citation-function))))) (goto-char start) + ;; Quote parts. + (while (re-search-forward "<#/?!*\\(multi\\|part\\)>" end t) + (goto-char (match-beginning 1)) + (insert "!")) + (goto-char start) (while functions (funcall (pop functions))) (when message-citation-line-function diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el index d4e05f0..78bf4c5 100644 --- a/lisp/mm-bodies.el +++ b/lisp/mm-bodies.el @@ -40,46 +40,49 @@ If there is more than one non-ASCII MULE charset, then list of found MULE charsets are returned. If successful, the MIME charset is returned. If no encoding was done, nil is returned." - (save-excursion - (goto-char (point-min)) - (let ((charsets - (delq 'ascii (mm-find-charset-region (point-min) (point-max)))) - charset) - (cond - ;; No encoding. - ((null charsets) - nil) - ;; Too many charsets. - ((> (length charsets) 1) - charsets) - ;; We encode. - (t - (let ((mime-charset - (mm-mime-charset (car charsets) (point-min) (point-max))) - start) - (when (or t - ;; We always decode. - (not (mm-coding-system-equal - mime-charset buffer-file-coding-system))) - (while (not (eobp)) - (if (eq (char-charset (char-after)) 'ascii) - (when start - (save-restriction - (narrow-to-region start (point)) - (mm-encode-coding-region start (point) mime-charset) - (goto-char (point-max))) - (setq start nil)) - (unless start - (setq start (point)))) - (forward-char 1)) - (when start - (mm-encode-coding-region start (point) mime-charset) - (setq start nil))) - mime-charset)))))) + (if (not (featurep 'mule)) + 'iso-8859-1 + (save-excursion + (goto-char (point-min)) + (let ((charsets + (delq 'ascii (mm-find-charset-region (point-min) (point-max)))) + charset) + (cond + ;; No encoding. + ((null charsets) + nil) + ;; Too many charsets. + ((> (length charsets) 1) + charsets) + ;; We encode. + (t + (let ((mime-charset + (mm-mime-charset (car charsets) (point-min) (point-max))) + start) + (when (or t + ;; We always decode. + (not (mm-coding-system-equal + mime-charset buffer-file-coding-system))) + (while (not (eobp)) + (if (eq (char-charset (char-after)) 'ascii) + (when start + (save-restriction + (narrow-to-region start (point)) + (mm-encode-coding-region start (point) mime-charset) + (goto-char (point-max))) + (setq start nil)) + (unless start + (setq start (point)))) + (forward-char 1)) + (when start + (mm-encode-coding-region start (point) mime-charset) + (setq start nil))) + mime-charset))))))) (defun mm-body-encoding () "Return the encoding of the current buffer." - (if (and + (if (and + (featurep 'mule) (null (delq 'ascii (find-charset-region (point-min) (point-max)))) ;;;!!!The following is necessary because the function ;;;!!!above seems to return the wrong result under Emacs 20.3. diff --git a/lisp/mm-util.el b/lisp/mm-util.el index e0d8920..2cd6003 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -224,9 +224,21 @@ See also `with-temp-file' and `with-output-to-string'." (defun mm-find-charset-region (b e) "Return a list of charsets in the region." - (if (and (boundp 'enable-multibyte-characters) - enable-multibyte-characters) - (find-charset-region b e) + (cond + ((and (boundp 'enable-multibyte-characters) + enable-multibyte-characters) + (find-charset-region b e)) + ((not (boundp 'current-language-environment)) + (save-excursion + (save-restriction + (narrow-to-region b e) + (goto-char (point-min)) + (skip-chars-forward "\0-\177") + (if (eobp) + '(ascii) + ;;;!!!bogus + (list 'ascii 'latin-iso8859-1))))) + (t ;; We are in a unibyte buffer, so we futz around a bit. (save-excursion (save-restriction @@ -237,7 +249,7 @@ See also `with-temp-file' and `with-output-to-string'." (skip-chars-forward "\0-\177") (if (eobp) '(ascii) - (list 'ascii (car (last (assq 'charset entry)))))))))) + (list 'ascii (car (last (assq 'charset entry))))))))))) (provide 'mm-util) diff --git a/texi/gnus.texi b/texi/gnus.texi index d10eb96..f6d8bfd 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename gnus -@settitle Pterodactyl Gnus 0.47 Manual +@settitle Pterodactyl Gnus 0.48 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -318,7 +318,7 @@ into another language, under the above conditions for modified versions. @tex @titlepage -@title Pterodactyl Gnus 0.47 Manual +@title Pterodactyl Gnus 0.48 Manual @author by Lars Magne Ingebrigtsen @page @@ -354,7 +354,7 @@ can be gotten by any nefarious means you can think of---@sc{nntp}, local spool or your mbox file. All at the same time, if you want to push your luck. -This manual corresponds to Pterodactyl Gnus 0.47. +This manual corresponds to Pterodactyl Gnus 0.48. @end ifinfo diff --git a/texi/message.texi b/texi/message.texi index f75be29..25d797f 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename message -@settitle Pterodactyl Message 0.47 Manual +@settitle Pterodactyl Message 0.48 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -42,7 +42,7 @@ into another language, under the above conditions for modified versions. @tex @titlepage -@title Pterodactyl Message 0.47 Manual +@title Pterodactyl Message 0.48 Manual @author by Lars Magne Ingebrigtsen @page @@ -83,7 +83,7 @@ Message mode buffers. * Key Index:: List of Message mode keys. @end menu -This manual corresponds to Pterodactyl Message 0.47. Message is +This manual corresponds to Pterodactyl Message 0.48. Message is distributed with the Gnus distribution bearing the same version number as this manual.