Mercurial > emacs
view lib-src/b2m.pl @ 82975:590114f9753d gnus-5_10-pre-merge-josefsson
2004-08-31 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-agent.el (gnus-agent-restore-gcc): Use ^ and regexp-quote.
* gnus-sum.el (gnus-newsgroup-variables): Doc fix (tiny change).
From Helmut Waitzmann <Helmut.Waitzmann@web.de>.
* gnus-agent.el (gnus-agent-regenerate-group): Activate the group
when the group's active is not available.
* gnus-art.el (article-hide-headers): Refer to the values for
gnus-ignored-headers and gnus-visible-headers in the summary
buffer since a user may have set them as group parameters.
(gnus-article-next-page): Fix the way to find a real end-of-buffer
(tiny change). From YAGI Tatsuya <ynyaaa@ybb.ne.jp>.
(gnus-article-read-summary-keys): Restore new window-start and
hscroll to summary window.
(gnus-prev-page-map): Remove duplicated one.
* gnus-cite.el (gnus-cite-ignore-quoted-from): New user option.
(gnus-cite-parse): Ignore quoted envelope From_. Suggested by
Karl Chen <quarl@nospam.quarl.org> and Reiner Steib
<Reiner.Steib@gmx.de>.
* gnus-cus.el (gnus-agent-cat-prepare-category-field): Replace
pp-to-string with gnus-pp-to-string.
* gnus-eform.el (gnus-edit-form): Replace pp with gnus-pp.
* gnus-group.el (gnus-group-make-kiboze-group): Replace pp with
gnus-pp.
* gnus-msg.el (gnus-setup-message): Ignore an article copy while
parsing gnus-posting-styles when the message is not for replying.
(gnus-summary-resend-message-edit): Call mime-to-mml. Suggested
by Hiroshi Fujishima <pooh@nature.tsukuba.ac.jp>.
(gnus-debug): Replace pp with gnus-pp.
* gnus-score.el (gnus-score-save): Replace pp with gnus-pp.
* gnus-spec.el (gnus-update-format): Replace pp-to-string with
gnus-pp-to-string.
* gnus-sum.el (gnus-read-header): Don't remove a header for the
parent article of a sparse article in the thread hashtb. From
Stefan Wiens <s.wi@gmx.net>.
* gnus-util.el (gnus-bind-print-variables): New macro.
(gnus-prin1): Use it.
(gnus-prin1-to-string): Use it.
(gnus-pp): New function.
(gnus-pp-to-string): New function.
* gnus.el: Don't make unnecessary *Group* buffer when loading.
* mail-source.el (mail-source-touch-pop): Doc fix.
* message.el (message-mode): Don't modify paragraph-separate there.
(message-setup-fill-variables): Add mml tags to paragraph-start
and paragraph-separate. Suggested by Andrew Korty <ajk@iu.edu>.
(message-smtpmail-send-it): Doc fix.
(message-exchange-point-and-mark): Don't activate region if it was
inactive. Suggested by Hiroshi Fujishima
<pooh@nature.tsukuba.ac.jp> and Jesper Harder <harder@ifa.au.dk>.
* mm-decode.el (mm-save-part): Bind enable-multibyte-characters to
t while entering a file name using the mm-with-multibyte macro.
Suggested by Hiroshi Fujishima <pooh@nature.tsukuba.ac.jp>.
* mm-encode.el (mm-content-transfer-encoding-defaults): Use
qp-or-base64 for the application/* types.
(mm-safer-encoding): Consider 7bit is safe.
* mm-util.el (mm-with-multibyte-buffer): New macro.
(mm-with-multibyte): New macro.
* mm-view.el (mm-inline-render-with-function): Use multibyte
buffer; decode html source by charset.
* nndoc.el (nndoc-type-alist): Improve regexp for article-begin,
add generate-head-function and generate-article-function to the
rfc822-forward entry.
(nndoc-forward-type-p): Recognize envelope From_.
(nndoc-rfc822-forward-generate-article): New function.
(nndoc-rfc822-forward-generate-head): New function.
From David Hedbor <dhedbor@real.com>.
* nnmail.el (nnmail-split-lowercase-expanded): New user option.
(nnmail-expand-newtext): Lowercase expanded entries if
nnmail-split-lowercase-expanded is non-nil.
* score-mode.el (gnus-score-pretty-print): Replace pp with gnus-pp.
* webmail.el (webmail-debug): Replace pp with gnus-pp.
* gnus-art.el (gnus-article-wash-html-with-w3m): Bind
w3m-safe-url-regexp as the value for mm-w3m-safe-url-regexp; use
w3m-minor-mode-map instead of mm-w3m-local-map-property.
(gnus-mime-save-part-and-strip): Use mm-complicated-handles
instead of mm-multiple-handles.
(gnus-mime-delete-part): Ditto.
* mm-decode.el (mm-multiple-handles): Recognize a string as a mime
handle, as well as a list.
(mm-complicated-handles): Former definition of mm-multiple-handles.
* mm-view.el (mm-w3m-mode-map): Remove.
(mm-w3m-local-map-property): Remove.
(mm-w3m-cid-retrieve-1): Call itself recursively. Suggested by
ARISAWA Akihiro <ari@mbf.sphere.ne.jp>.
(mm-w3m-cid-retrieve): Simplify.
(mm-inline-text-html-render-with-w3m): Decode html source by
charset; check META tags only when charsets are not specified in
headers; specify charset to w3m-region; use w3m-minor-mode-map
instead of mm-w3m-local-map-property.
author | Reiner Steib <Reiner.Steib@gmx.de> |
---|---|
date | Tue, 31 Aug 2004 14:47:59 +0000 |
parents | 695cf19ef79e |
children | f0eb34e60705 23a17af379b1 375f2633d815 |
line wrap: on
line source
#!/usr/bin/perl # b2m.pl - Script to convert a Babyl file to an mbox file # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. # Maintained by Jonathan Kamens <jik@kamens.brookline.ma.us>. # Requires CPAN modules: MailTools (for Mail::Address), TimeDate (for # Date::Parse). use warnings; use strict; use File::Basename; use Getopt::Long; use Mail::Address; use Date::Parse; my($whoami) = basename $0; my($version) = '$Revision: 1.5 $'; my($usage) = "Usage: $whoami [--help] [--version] [--[no]full-headers] [Babyl-file] \tBy default, full headers are printed.\n"; my($opt_help, $opt_version); my($opt_full_headers) = 1; die $usage if (! GetOptions( 'help' => \$opt_help, 'version' => \$opt_version, 'full-headers!' => \$opt_full_headers, )); if ($opt_help) { print $usage; exit; } elsif ($opt_version) { print "$whoami version: $version\n"; exit; } die $usage if (@ARGV > 1); $/ = "\n\037"; if (<> !~ /^BABYL OPTIONS:/) { die "$whoami: $ARGV is not a Babyl file\n$usage"; } while (<>) { my($msg_num) = $. - 1; my($labels, $pruned, $full_header, $header); my($from_line, $from_addr); my($time); # This will strip the initial form feed, any whitespace that may # be following it, and then a newline s/^\s+//; # This will strip the ^_ off of the end of the message s/\037$//; if (! s/(.*)\n//) { malformatted: warn "$whoami: message $msg_num in $ARGV is malformatted\n"; next; } $labels = $1; # Strip the integer indicating whether the header is pruned $labels =~ s/^(\d+)[,\s]*//; $pruned = $1; s/(?:((?:.+\n)+)\n*)?\*\*\* EOOH \*\*\*\n+// || goto malformatted; $full_header = $1; if (s/((?:.+\n)+)\n+//) { $header = $1; } else { # Message has no body $header = $_; $_ = ''; } # "$pruned eq '0'" is different from "! $pruned". We want to make # sure that we found a valid label line which explicitly indicated # that the header was not pruned. if ((! $full_header) || ($pruned eq '0')) { $full_header = $header; } # End message with two newlines (some mbox parsers require a blank # line before the next "From " line). s/\s+$/\n\n/; # Quote "^From " s/(^|\n)From /$1>From /g; # Strip extra commas and whitespace from the end $labels =~ s/[,\s]+$//; # Now collapse extra commas and whitespace in the remaining label string $labels =~ s/[,\s]+/, /g; foreach my $rmail_header qw(summary-line x-coding-system) { $full_header =~ s/(^|\n)$rmail_header:.*\n/$1/i; } if ($full_header =~ s/(^|\n)mail-from:\s*(From .*)\n/$1/i) { ($from_line = $2) =~ s/\s*$/\n/; } else { foreach my $addr_header qw(return-path from really-from sender) { if ($full_header =~ /(?:^|\n)$addr_header:\s*(.*\n(?:\B.*\n)*)/i) { my($addr) = Mail::Address->parse($1); $from_addr = $addr->address($addr); last; } } if (! $from_addr) { $from_addr = "Babyl_to_mail_by_$whoami\@localhost"; } if ($full_header =~ /(?:^|\n)date:\s*(\S.*\S)/i) { $time = str2time($1); } if (! $time) { # No Date header or we failed to parse it $time = time; } $from_line = "From " . $from_addr . " " . localtime($time) . "\n"; } print($from_line, ($opt_full_headers ? $full_header : $header), ($labels ? "X-Babyl-Labels: $labels\n" : ""), "\n", $_) || die "$whoami: error writing to stdout: $!\n"; } close(STDOUT) || die "$whoami: Error closing stdout: $!\n"; # arch-tag: 8c7c8ab0-721c-46d7-ba3e-139801240aa8