From 446fe302d802f1656e1f1d425d3f737d13d1b2bd Mon Sep 17 00:00:00 2001 From: ichikawa Date: Thu, 3 Dec 1998 15:25:59 +0000 Subject: [PATCH] Sync up with Pteroductyl Gnus 0.62 --- ChangeLog | 8 ++++++++ README.ichikawa | 3 ++- lisp/ChangeLog | 46 ++++++++++++++++++++++++++++++++++++++++++++++ lisp/gnus-art.el | 19 ++++++++++--------- lisp/gnus-mailcap.el | 2 +- lisp/gnus-msg.el | 9 +++++++++ lisp/gnus-picon.el | 12 +++++++----- lisp/gnus-sum.el | 5 +++++ lisp/gnus.el | 4 ++-- lisp/mm-decode.el | 8 ++++++++ lisp/mm-encode.el | 1 + lisp/mm-view.el | 8 ++------ lisp/mml.el | 10 ++++++---- lisp/nntp.el | 4 +++- texi/ChangeLog | 9 +++++++++ texi/gnus-ja.texi | 6 +++--- texi/gnus.texi | 25 +++++++++++++++++++++---- texi/message-ja.texi | 6 +++--- texi/message.texi | 6 +++--- 19 files changed, 149 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index c8d897f..c9fdc34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1998-12-04 Tatsuya Ichikawa + + * lisp/gnus.el (gnus-version-number): Update to 6.10.047. + + * Sync up with Pterodactyl Gnus 0.62. + + * README.ichikawa: Add description of required APEL/FLIM/SEMI. + 1998-12-03 Katsumi Yamaoka * lisp/nndraft.el (nndraft-request-article): Don't bind diff --git a/README.ichikawa b/README.ichikawa index 1b80afe..a9f3f9f 100644 --- a/README.ichikawa +++ b/README.ichikawa @@ -31,4 +31,5 @@ NEWS: * T-gnus 6.8.17 is the last version based on Gnus v5.6. After this , T-gnus 6.10 - this is based on Pterodactyl Gnus. - The latest T-gnus is T-gnus 6.10.046 (Based on pgnus-0.61). + The latest T-gnus is T-gnus 6.10.047 (Based on pgnus-0.62). + It requires SEMI/WEMI-1.12 , FLIM-1.11 , APEL-9.6(or later). diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7aa0e54..1b57a46 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,49 @@ +Thu Dec 3 12:53:58 1998 Lars Magne Ingebrigtsen + + * gnus.el: Pterodactyl Gnus v0.62 is released. + +1998-12-03 13:38:36 Lars Magne Ingebrigtsen + + * gnus-art.el (gnus-mime-view-all-parts): Work with multiparts. + +1998-12-03 Hrvoje Niksic + + * mm-view.el (mm-inline-text): Use `point-min-marker' and + `point-max-marker'. + +1998-12-03 13:22:57 Lars Magne Ingebrigtsen + + * mailcap.el (mailcap-mime-extensions): Use image/xpm for xpms. + + * gnus-art.el (gnus-mime-display-single): Check for attachment + before other tests. + +1998-12-03 Didier Verna + + * gnus-msg.el (gnus-configure-posting-styles): find a + posting-style entry in the group parameters, if any, and honor it + at the end. + +1998-12-03 13:03:37 Felix Lee + + * nntp.el (nntp-after-change-function): Fix. + +1998-12-03 12:44:30 Mike McEwan + + * mml.el (mml-generate-mime-1): Insert literally. + +1998-12-03 00:23:17 Lars Magne Ingebrigtsen + + * mml.el (mml-insert-mime-headers): Removed debug. + +1998-12-02 22:22:03 Lars Magne Ingebrigtsen + + * gnus-sum.el (gnus-summary-show-article): Destroy parts when + prefixed. + + * mm-encode.el (mm-content-transfer-encoding-defaults): Default + application/emacs-lisp to 8bit. + Wed Dec 2 20:24:27 1998 Lars Magne Ingebrigtsen * gnus.el: Pterodactyl Gnus v0.61 is released. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index ff364b8..fc3848e 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -2435,16 +2435,17 @@ If ALL-HEADERS is non-nil, no headers are hidden." (goto-char (posn-point pos)) (funcall response)))) -(defun gnus-mime-view-all-parts () +(defun gnus-mime-view-all-parts (&optional handles) "View all the MIME parts." (interactive) (save-current-buffer (set-buffer gnus-article-buffer) - (let ((handles gnus-article-mime-handles) + (let ((handles (or handles gnus-article-mime-handles)) (rfc2047-default-charset gnus-newsgroup-default-charset) (mm-charset-iso-8859-1-forced gnus-newsgroup-iso-8859-1-forced)) - (while handles - (mm-display-part (pop handles)))))) + (if (stringp (car handles)) + (gnus-mime-view-all-parts (cdr handles)) + (mapcar 'mm-display-part handles))))) (defun gnus-mime-save-part () "Save the MIME part under point." @@ -2721,13 +2722,13 @@ If ALL-HEADERS is non-nil, no headers are hidden." (while ignored (when (string-match (pop ignored) type) (throw 'ignored nil))) - (if (and (mm-automatic-display-p type) - (or (mm-inlinable-part-p type) - (mm-automatic-external-display-p type)) - (setq not-attachment + (if (and (setq not-attachment (or (not (mm-handle-disposition handle)) (equal (car (mm-handle-disposition handle)) - "inline")))) + "inline"))) + (mm-automatic-display-p type) + (or (mm-inlinable-part-p type) + (mm-automatic-external-display-p type))) (setq display t) (when (equal (car (split-string type "/")) "text") diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el index c262922..57fbf36 100644 --- a/lisp/gnus-mailcap.el +++ b/lisp/gnus-mailcap.el @@ -749,7 +749,7 @@ this type is returned." (".wav" . "audio/x-wav") (".wrl" . "x-world/x-vrml") (".xbm" . "image/xbm") - (".xpm" . "image/x-pixmap") + (".xpm" . "image/xpm") (".xwd" . "image/windowdump") (".zip" . "application/zip") (".ai" . "application/postscript") diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 2332c5e..6ee0f57 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -1123,6 +1123,15 @@ this is a reply." (gnus-newsgroup-name (or gnus-newsgroup-name "")) style match variable attribute value value-value) (make-local-variable 'gnus-message-style-insertions) + ;; If the group has a posting-style parameter, add it at the end with a + ;; regexp matching everything, to be sure it takes precedence over all + ;; the others. + (unless (eq 0 (length gnus-newsgroup-name)) + (let ((tmp-style (gnus-group-find-parameter gnus-newsgroup-name + 'posting-style t))) + (and tmp-style + (setq styles (append styles (list (cons ".*" tmp-style))))) + )) ;; Go through all styles and look for matches. (while styles (setq style (pop styles) diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el index ace8fd7..4f50461 100644 --- a/lisp/gnus-picon.el +++ b/lisp/gnus-picon.el @@ -344,11 +344,13 @@ To use: (setq gnus-article-x-face-command 'gnus-picons-display-x-face)" (or (null gnus-picons-group-excluded-groups) (not (string-match gnus-picons-group-excluded-groups gnus-newsgroup-name)))) - (let ((groups - (if gnus-picons-display-article-move-p - (list (gnus-group-real-name gnus-newsgroup-name)) - (split-string (mail-fetch-field "newsgroups") ","))) - group) + (let* ((newsgroups (mail-fetch-field "newsgroups")) + (groups + (if (or gnus-picons-display-article-move-p + (not newsgroups))(mail-fetch-field "newsgroups") + (list (gnus-group-real-name gnus-newsgroup-name)) + (split-string newsgroups ","))) + group) (save-excursion (gnus-picons-prepare-for-annotations) (while (setq group (pop groups)) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index e75633b..2c051e2 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -6964,6 +6964,11 @@ article massaging functions being run." gnus-break-pages gnus-show-mime gnus-visual) + ;; Destroy any MIME parts. + (when (gnus-buffer-live-p gnus-article-buffer) + (save-excursion + (set-buffer gnus-article-buffer) + (mm-destroy-parts gnus-article-mime-handles))) (gnus-summary-select-article nil 'force))) (gnus-summary-goto-subject gnus-current-article) (gnus-summary-position-point)) diff --git a/lisp/gnus.el b/lisp/gnus.el index 47c65ee..4ada523 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -259,10 +259,10 @@ is restarted, and sometimes reloaded." (defconst gnus-product-name "T-gnus" "Product name of this version of gnus.") -(defconst gnus-version-number "6.10.046" +(defconst gnus-version-number "6.10.047" "Version number for this version of gnus.") -(defconst gnus-original-version-number "0.61" +(defconst gnus-original-version-number "0.62" "Version number for this version of Gnus.") (defconst gnus-original-product-name "Pterodactyl Gnus" diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index f7653b6..7b0061f 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -67,6 +67,8 @@ (eq (device-type) 'x))) ("image/xpm" mm-inline-image (and window-system (featurep 'xpm))) + ("image/x-pixmap" mm-inline-image + (and window-system (featurep 'xpm))) ("image/bmp" mm-inline-image (and window-system (featurep 'bmp))) ("text/plain" mm-inline-text t) @@ -543,6 +545,12 @@ This overrides entries in the mailcap file." "Return an image instance based on HANDLE." (let ((type (cadr (split-string (car (mm-handle-type handle)) "/"))) spec) + ;; Allow some common translations. + (setq type + (cond + ((equal type "x-pixmap") + "xpm") + (t type))) (or (mm-handle-cache handle) (mm-with-unibyte-buffer (insert-buffer-substring (mm-handle-buffer handle)) diff --git a/lisp/mm-encode.el b/lisp/mm-encode.el index 7f0f26f..ce742d1 100644 --- a/lisp/mm-encode.el +++ b/lisp/mm-encode.el @@ -29,6 +29,7 @@ (defvar mm-content-transfer-encoding-defaults '(("text/.*" quoted-printable) + ("application/emacs-lisp" 8bit) (".*" base64)) "Alist of regexps that match MIME types and their encodings.") diff --git a/lisp/mm-view.el b/lisp/mm-view.el index 64abdc3..ccc513c 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -66,9 +66,7 @@ handle `(lambda () (let (buffer-read-only) - (delete-region - ,(set-marker (make-marker) (point-min)) - ,(set-marker (make-marker) (point-max))))))))) + (delete-region ,(point-min-marker) ,(point-max-marker)))))))) ((equal type "html") (mm-setup-w3) (setq text (mm-get-part handle)) @@ -89,9 +87,7 @@ (remove-specifier (face-property 'default prop) (current-buffer))) '(background background-pixmap foreground)) - (delete-region - ,(set-marker (make-marker) (point-min)) - ,(set-marker (make-marker) (point-max))))))))) + (delete-region ,(point-min-marker) ,(point-max-marker)))))))) ((or (equal type "enriched") (equal type "richtext")) (save-excursion diff --git a/lisp/mml.el b/lisp/mml.el index 5184ace..1e2f6ab 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -102,7 +102,10 @@ (eq charset current))) ;; The initial charset was ascii. ((eq current 'ascii) - (setq current charset)) + (setq current charset + space nil + newline nil + paragraph nil)) ;; We have a change in charsets. (t (push (append @@ -214,7 +217,7 @@ (setq coded (buffer-string))) (mm-with-unibyte-buffer (if (setq filename (cdr (assq 'filename cont))) - (insert-file-contents filename) + (insert-file-contents-literally filename) (insert (cdr (assq 'contents cont)))) (setq encoding (mm-encode-buffer type) coded (buffer-string)))) @@ -313,9 +316,8 @@ cont '(name access-type expiration size permission))) (not (equal type "text/plain"))) (when (consp charset) - (debug) (error - "Can't encode a part with several charsets. Insert a <#part>.")) + "Can't encode a part with several charsets.")) (insert "Content-Type: " type) (when charset (insert "; " (mail-header-encode-parameter diff --git a/lisp/nntp.el b/lisp/nntp.el index c0e80a6..731923d 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -944,7 +944,9 @@ password contained in '~/.nntp-authinfo'." ;; we only care about insertions at eob (when (and (eq 0 len) (eq (point-max) end)) (save-match-data - (nntp-async-trigger (get-buffer-process (current-buffer))))) + (let ((proc (get-buffer-process (current-buffer)))) + (when proc + (nntp-async-trigger proc))))) ;; any throw from after-change-functions will leave it ;; set to nil. so we reset it here, if necessary. (when quit-flag diff --git a/texi/ChangeLog b/texi/ChangeLog index bd447d8..a731318 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,12 @@ +1998-12-03 13:34:48 James Troup + + * gnus.texi (MIME Commands): Typo fix. + +1998-12-03 Didier Verna + + * gnus.texi (Group Parameters): update for the posting-style group + parameter. + 1998-12-02 01:04:22 Lars Magne Ingebrigtsen * gnus.texi (Emacsen): Addition. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 23413e5..d7c1d4d 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename gnus-ja -@settitle Semi-gnus 6.10.046 Manual +@settitle Semi-gnus 6.10.047 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -345,7 +345,7 @@ into another language, under the above conditions for modified versions. @tex @titlepage -@title Semi-gnus 6.10.046 Manual +@title Semi-gnus 6.10.047 Manual @author by Lars Magne Ingebrigtsen @author by members of Semi-gnus mailing-list @@ -399,7 +399,7 @@ Semi-gnus $B$O!"Bg$-$J3($,F~$C$F$$$?$j$5$^$6$^$J7A<0$rMQ$$$?$j$7$F$$$k$A$g$C(B $B$J8@8l7w$r:9JL$7$^$;$s!#$"$"!"%/%j%s%4%s$NJ}$O(B Unicode Next Generation$B$r(B $B$*BT$A$/$@$5$$!#(B -$B$3$N@bL@=q$O(B Semi-gnus 6.10.046 $B$KBP1~$7$^$9!#(B +$B$3$N@bL@=q$O(B Semi-gnus 6.10.047 $B$KBP1~$7$^$9!#(B @end ifinfo diff --git a/texi/gnus.texi b/texi/gnus.texi index 61d2cc3..2c56a89 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename gnus -@settitle Semi-gnus 6.10.046 Manual +@settitle Semi-gnus 6.10.047 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 Semi-gnus 6.10.046 Manual +@title Semi-gnus 6.10.047 Manual @author by Lars Magne Ingebrigtsen @page @@ -361,7 +361,7 @@ internationalization/localization and multiscript features based on MULE API. So Semi-gnus does not discriminate various language communities. Oh, if you are a Klingon, please wait Unicode Next Generation. -This manual corresponds to Semi-gnus 6.10.046. +This manual corresponds to Semi-gnus 6.10.047. @end ifinfo @@ -2174,6 +2174,23 @@ something like @code{(dummy-variable (ding))} in the parameters of that group. @code{dummy-variable} will be set to the result of the @code{(ding)} form, but who cares? +@item posting-style +You can store additional posting style information for this group only +here (@pxref{Posting Styles}). The format is that of an entry in the +@code{gnus-posting-styles} alist, except that there's no regexp matching +the group name (of course). Style elements in this group parameter will +take precedence over the ones found in @code{gnus-posting-styles}. + +For instance, if you want a funky name and signature in this group only, +instead of hacking @code{gnus-posting-styles}, you could put something +like this in the group parameters: + +@example +(posting-style + (name "Funky Name") + (signature "Funky Signature")) +@end example + @end table Use the @kbd{G p} command to edit group parameters of a group. You @@ -6927,7 +6944,7 @@ signature after all. @cindex MIME decoding @table @kbd -@item M-tgnus-summary-display-buttonized +@item M-t @kindex M-t (Summary) @findex gnus-summary-display-buttonized Toggle the buttonized display of the article buffer diff --git a/texi/message-ja.texi b/texi/message-ja.texi index ddb1ca4..d256af3 100644 --- a/texi/message-ja.texi +++ b/texi/message-ja.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename message-ja -@settitle Message 6.10.046 Manual +@settitle Message 6.10.047 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -60,7 +60,7 @@ into another language, under the above conditions for modified versions. @tex @titlepage -@title Message 6.10.046 Manual +@title Message 6.10.047 Manual @author by Lars Magne Ingebrigtsen @translated by members of Semi-gnus mailing-list @@ -112,7 +112,7 @@ Gnus $B$NA4$F$N%a%C%;!<%8$N:n@.(B ($B%a!<%k$H%K%e!<%9$NN>J}(B) $B$O%a%C%;!< * Key Index:: $B%a%C%;!<%8%b!<%I%-!<$N0lMw!#(B @end menu -$B$3$N%^%K%e%"%k$O(B Message 6.10.046 $B$KBP1~$7$^$9!#(BMessage $B$O$3$N%^%K%e%"%k$H(B +$B$3$N%^%K%e%"%k$O(B Message 6.10.047 $B$KBP1~$7$^$9!#(BMessage $B$O$3$N%^%K%e%"%k$H(B $BF1$8HGHV9f$N(B Gnus $B$NG[I[$H6&$KG[I[$5$l$^$9!#(B diff --git a/texi/message.texi b/texi/message.texi index b213d78..01edcb2 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename message -@settitle Message 6.10.046 Manual +@settitle Message 6.10.047 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 Message 6.10.046 Manual +@title Message 6.10.047 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 Message 6.10.046. Message is +This manual corresponds to Message 6.10.047. Message is distributed with the Gnus distribution bearing the same version number as this manual. -- 1.7.10.4