From 009e7a4287f5cf6876c244b5f20b5c206db581a3 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 8 Sep 1998 05:45:55 +0000 Subject: [PATCH] Importing pgnus-0.19. --- lisp/ChangeLog | 12 ++++++++++++ lisp/base64.el | 13 ++++++------- lisp/gnus-draft.el | 2 ++ lisp/gnus.el | 2 +- lisp/lpath.el | 4 +++- lisp/mm-bodies.el | 10 ++-------- lisp/mm-util.el | 11 +++++++++++ lisp/rfc2047.el | 6 +----- texi/gnus.texi | 6 +++--- texi/message.texi | 6 +++--- 10 files changed, 44 insertions(+), 28 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 06e1752..b65153b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +Tue Sep 8 07:09:28 1998 Lars Magne Ingebrigtsen + + * gnus.el: Pterodactyl Gnus v0.19 is released. + +1998-09-08 04:51:39 Lars Magne Ingebrigtsen + + * base64.el (base64-encode-region): Accept no-line-break. + + * mm-util.el (mm-mime-charset): New function. + + * gnus-draft.el (gnus-draft-edit-message): Delete article. + Tue Sep 8 04:29:23 1998 Lars Magne Ingebrigtsen * gnus.el: Pterodactyl Gnus v0.18 is released. diff --git a/lisp/base64.el b/lisp/base64.el index 4b55dd5..3d89247 100644 --- a/lisp/base64.el +++ b/lisp/base64.el @@ -184,7 +184,7 @@ base64-encoder-program.") ;;(message "Decoding base64... done") ) -(defun base64-encode-region (start end) +(defun base64-encode-region (start end &optional no-line-break) (interactive "r") (message "Encoding base64...") (let ((work-buffer nil) @@ -221,7 +221,8 @@ base64-encoder-program.") (aref alphabet (logand bits 63)) 1 nil work-buffer) (setq cols (+ cols 4)) - (cond ((= cols 72) + (cond ((and (= cols 72) + (not no-line-break)) (base64-insert-char ?\n 1 nil work-buffer) (setq cols 0))) (setq bits 0 counter 0)) @@ -240,11 +241,9 @@ base64-encoder-program.") (base64-insert-char (aref alphabet (logand (lsh bits -6) 63)) 1 nil work-buffer) (base64-insert-char ?= 1 nil work-buffer))) - ;;;!!! LMI removed this, because he didn't like having - ;;;!!! newlines added to the end of the encoding. - ;;(if (> cols 0) - ;; (base64-insert-char ?\n 1 nil work-buffer)) - ) + (if (and (> cols 0) + (not no-line-break)) + (base64-insert-char ?\n 1 nil work-buffer))) (or (markerp end) (setq end (set-marker (make-marker) end))) (goto-char start) (insert-buffer-substring work-buffer) diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el index 3b85b57..2c87c31 100644 --- a/lisp/gnus-draft.el +++ b/lisp/gnus-draft.el @@ -95,6 +95,8 @@ (let ((article (gnus-summary-article-number))) (gnus-summary-mark-as-read article gnus-canceled-mark) (gnus-draft-setup article gnus-newsgroup-name) + (let ((gnus-verbose-backends nil)) + (gnus-request-expire-articles (list article) gnus-newsgroup-name t)) (push `((lambda () (when (gnus-buffer-exists-p ,gnus-summary-buffer) diff --git a/lisp/gnus.el b/lisp/gnus.el index 08ee518..2bbe106 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -250,7 +250,7 @@ is restarted, and sometimes reloaded." :link '(custom-manual "(gnus)Exiting Gnus") :group 'gnus) -(defconst gnus-version-number "0.18" +(defconst gnus-version-number "0.19" "Version number for this version of Gnus.") (defconst gnus-version (format "Pterodactyl Gnus v%s" gnus-version-number) diff --git a/lisp/lpath.el b/lisp/lpath.el index cfee844..20ad587 100644 --- a/lisp/lpath.el +++ b/lisp/lpath.el @@ -34,7 +34,9 @@ set-buffer-multibyte find-non-ascii-charset-region char-charset mule-write-region-no-coding-system - find-charset-region base64-decode-string)) + find-charset-region base64-decode-string + find-coding-systems-region get-charset-property + coding-system-get)) (maybe-bind '(global-face-data mark-active transient-mark-mode mouse-selection-click-count mouse-selection-click-count-buffer buffer-display-table diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el index c74994e..1b208d2 100644 --- a/lisp/mm-bodies.el +++ b/lisp/mm-bodies.el @@ -51,14 +51,8 @@ If no encoding was done, nil is returned." charsets) ;; We encode. (t - (let ((mime-charset - (or - (coding-system-get - (get-charset-property (car charsets) 'prefered-coding-system) - 'mime-charset) - (car (memq (car charsets) - (find-coding-systems-region - (point-min) (point-max)))))) + (let ((mime-charset + (mm-mime-charset (car charsets) (point-min) (point-max))) start) (when (or t ;; We always decode. diff --git a/lisp/mm-util.el b/lisp/mm-util.el index b36c62b..838a5c8 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -185,6 +185,17 @@ used as the line break code type of the coding system." (when (string-match "charset *= *\"? *\\([-0-9a-zA-Z_]+\\)\"? *$" header) (intern (downcase (match-string 1 header))))) + +(defun mm-mime-charset (charset b e) + (if (fboundp 'coding-system-get) + (or + (coding-system-get + (get-charset-property charset 'prefered-coding-system) + 'mime-charset) + (car (memq charset (find-coding-systems-region + (point-min) (point-max))))) + (mm-mule-charset-to-mime-charset charset))) + (provide 'mm-util) ;;; mm-util.el ends here diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el index 907a084..c96aeb2 100644 --- a/lisp/rfc2047.el +++ b/lisp/rfc2047.el @@ -181,11 +181,7 @@ Should be called narrowed to the head of the message." (defun rfc2047-encode (b e charset) "Encode the word in the region with CHARSET." (let* ((mime-charset - (or - (coding-system-get - (get-charset-property charset 'prefered-coding-system) - 'mime-charset) - (car (memq charset (find-coding-systems-region b e))))) + (mm-mime-charset charset b e)) (encoding (or (cdr (assq mime-charset rfc2047-charset-encoding-alist)) 'B)) diff --git a/texi/gnus.texi b/texi/gnus.texi index b5e10b1..436d3f9 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename gnus -@settitle Pterodactyl Gnus 0.18 Manual +@settitle Pterodactyl Gnus 0.19 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.18 Manual +@title Pterodactyl Gnus 0.19 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.18. +This manual corresponds to Pterodactyl Gnus 0.19. @end ifinfo diff --git a/texi/message.texi b/texi/message.texi index e81be33..1574359 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename message -@settitle Pterodactyl Message 0.18 Manual +@settitle Pterodactyl Message 0.19 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.18 Manual +@title Pterodactyl Message 0.19 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.18. Message is +This manual corresponds to Pterodactyl Message 0.19. Message is distributed with the Gnus distribution bearing the same version number as this manual has. -- 1.7.10.4