--- perlbug.PL-blead	2008-06-07 23:40:56.000000000 -0400
+++ perlbug.PL	2008-06-07 23:41:07.000000000 -0400
@@ -81,6 +81,8 @@
 
 print OUT <<'!NO!SUBS!';
 
+use warnings;
+no warnings 'once'; # Eventually, the $::opt_ stuff should get cleaned up
 use strict;
 use Config;
 use File::Spec;		# keep perlbug Perl 5.005 compatible
@@ -90,18 +92,18 @@
 sub paraprint;
 
 BEGIN {
-    eval "use Mail::Send;";
+    eval { require Mail::Send;};
     $::HaveSend = ($@ eq "");
-    eval "use Mail::Util;";
+    eval { require Mail::Util; } ;
     $::HaveUtil = ($@ eq "");
     # use secure tempfiles wherever possible
-    eval "require File::Temp;";
+    eval { require File::Temp; };
     $::HaveTemp = ($@ eq "");
     eval { require Module::CoreList; };
     $::HaveCoreList = ($@ eq "");
 };
 
-my $Version = "1.36";
+my $Version = "1.39";
 
 # Changed in 1.06 to skip Mail::Send and Mail::Util if not available.
 # Changed in 1.07 to see more sendmail execs, and added pipe output.
@@ -142,16 +144,31 @@
 # Changed in 1.34 Added Message-Id RFOLEY 18-06-2002 
 # Changed in 1.35 Use File::Temp (patch from Solar Designer) NWCLARK 28-02-2004
 # Changed in 1.36 Initial Module::CoreList support Alexandr Ciornii 11-07-2007
-
-# TODO: - Allow the user to re-name the file on mail failure, and
-#       make sure failure (transmission-wise) of Mail::Send is
-#       accounted for.
+# Changed in 1.37 Killed some string evals, rewrote most prose JESSE 2008-06-08
+# Changed in 1.38 Actually enforce the CoreList check,
+#                 Record the module the user enters if they do so
+#                 Refactor prompts to use common code           JESSE 2008-06-08
+# Changed in 1.39 Trap mail sending failures (simple ones) so   JESSE 2008-06-08
+#                 users might be able to recover their bug reports
+#                 Refactor mail sending routines
+#                 Unify message building code
+#                 Unify message header building
+#                 Fix "module" prompting to not squish "category" prompting 
+#                 use warnings; (except 'once' warnings)
+#                 Unified report fingerprint/change detection code
+#                 Removed some labeled 'gotos'
+#TODO:
+#       make sure failure (transmission-wise) of Mail::Send is accounted for.
+#       (This may work now. Unsure of the original author's issue -JESSE 2008-06-08)
 #       - Test -b option
 
 my( $file, $usefile, $cc, $address, $bugaddress, $testaddress, $thanksaddress,
     $filename, $messageid, $domain, $subject, $from, $verbose, $ed, $outfile,
-    $Is_MacOS, $category, $severity, $fh, $me, $Is_MSWin32, $Is_Linux, $Is_VMS,
-    $msg, $body, $andcc, %REP, $ok, $thanks, $Is_OpenBSD, $progname);
+    $fh, $me, $body, $andcc, %REP, $ok, $thanks, $progname,
+    $Is_MacOS, $Is_MSWin32, $Is_Linux, $Is_VMS, $Is_OpenBSD,
+    $report_about_module, $category, $severity,
+
+);
 
 my $perl_version = $^V ? sprintf("%vd", $^V) : $];
 
@@ -172,7 +189,12 @@
 Query();
 Edit() unless $usefile || ($ok and not $::opt_n);
 NowWhat();
-Send();
+if ($outfile) {
+    save_message_to_disk($outfile);
+} else {
+    Send();
+    print "\nThank you for taking the time to file a bug report!\n\n";
+}
 
 exit;
 
@@ -193,30 +215,26 @@
 	    'opts'    => [qw(critical high medium low wishlist none)], # zero
 	},
     );
-    die "Invalid alternative($name) requested\n" unless grep(/^$name$/, keys %alts);
+    die "Invalid alternative ($name) requested\n" unless grep(/^$name$/, keys %alts);
     my $alt = "";
     my $what = $ok || $thanks;
     if ($what) {
 	$alt = $alts{$name}{$what};
     } else {
  	my @alts = @{$alts{$name}{'opts'}};
+    print "\n\n";
 	paraprint <<EOF;
-Please pick a \u$name from the following:
+Please pick a $name from the following list:
 
     @alts
-
 EOF
 	my $err = 0;
 	do {
 	    if ($err++ > 5) {
 		die "Invalid $name: aborting.\n";
 	    }
-	    print "Please enter a \u$name [$alts{$name}{'default'}]: ";
-	    $alt = <>;
-	    chomp $alt;
-	    if ($alt =~ /^\s*$/) {
-		$alt = $alts{$name}{'default'};
-	    }
+        $alt = _prompt('', "\u$name", $alts{$name}{'default'});
+		$alt ||= $alts{$name}{'default'};
 	} while !((($alt) = grep(/^$alt/i, @alts)));
     }
     lc $alt;
@@ -232,7 +250,7 @@
     $Is_MacOS = $^O eq 'MacOS';
 
     @ARGV = split m/\s+/,
-        MacPerl::Ask('Provide command-line args here (-h for help):')
+        MacPerl::Ask('Provide command line args here (-h for help):')
         if $Is_MacOS && $MacPerl::Version =~ /App/;
 
     if (!getopts("Adhva:s:b:f:F:r:e:SCc:to:n:T")) { Help(); exit; };
@@ -384,46 +402,42 @@
 EOF
 	} else {
 	    paraprint <<"EOF";
-This program provides an easy way to create a message reporting a bug
-in perl, and e-mail it to $address.  It is *NOT* intended for
-sending test messages or simply verifying that perl works, *NOR* is it
-intended for reporting bugs in third-party perl modules.  It is *ONLY*
-a means of reporting verifiable problems with the core perl distribution,
-and any solutions to such problems, to the people who maintain perl.
-
-If you're just looking for help with perl, try posting to the Usenet
-newsgroup comp.lang.perl.misc.  If you're looking for help with using
-perl with CGI, try posting to comp.infosystems.www.programming.cgi.
+This program provides an easy way to create a message reporting a
+bug in the core perl distribution (along with tests or patches)
+to the volunteers who maintain perl at $address.  To send a thank-you
+note to $thanksaddress instead of a bug report, please run 'perlthanks'.
 
-When invoked as perlthanks (or with the -T option) it can be used to
-send a thank-you message to $thanksaddress.
+Please do not use $0 to send test messages, test whether perl
+works, or to report bugs in perl modules from CPAN.
+
+For help using perl, try posting to the Usenet newsgroup 
+comp.lang.perl.misc.
 EOF
 	}
     }
 
     # Prompt for subject of message, if needed
     
-    if (TrivialSubject($subject)) {
+    if ($subject && TrivialSubject($subject)) {
 	$subject = '';
     }
 
     unless ($subject) {
-	if ($thanks) {
-	    paraprint "First of all, please provide a subject for the message.\n";
-	} else {
+	    print 
+"First of all, please provide a subject for the message.\n";
+	if ( not $thanks)  {
 	    paraprint <<EOF;
-First of all, please provide a subject for the
-message. It should be a concise description of
-the bug or problem. "perl bug" or "perl problem"
-is not a concise description.
+This should be a concise description of your bug or problem
+which will help the volunteers working to improve perl to categorize
+and resolve the issue.  Be as specific and descriptive as
+you can. A subject like "perl bug" or "perl problem" will make it
+much less likely that your issue gets the attention it deserves.
 EOF
 	}
 
 	my $err = 0;
 	do {
-	    print "Subject: ";
-	    $subject = <>;
-	    chomp $subject;
+        $subject = _prompt('','Subject');
 	    if ($err++ == 5) {
 		if ($thanks) {
 		    $subject = 'Thanks for Perl';
@@ -461,14 +475,17 @@
 	if ($guess) {
 	    unless ($ok) {
 		paraprint <<EOF;
-Your e-mail address will be useful if you need to be contacted. If the
-default shown is not your full internet e-mail address, please correct it.
+Perl's developers may need your email address to contact you for
+further information about your issue or to inform you when it is
+resolved.  If the default shown is not your email address, please
+correct it.
 EOF
 	    }
 	} else {
 	    paraprint <<EOF;
-So that you may be contacted if necessary, please enter
-your full internet e-mail address here.
+Please enter your full internet email address so that Perl's
+developers can contact you with questions about your issue or to
+inform you that it has been resolved.
 EOF
 	}
 
@@ -477,9 +494,7 @@
 	    $from = $guess;
 	} else {
 	    # verify it
-	    print "Your address [$guess]: ";
-	    $from = <>;
-	    chomp $from;
+        $from = _prompt('','Your address',$guess);
 	    $from = $guess if $from eq '';
 	}
     }
@@ -491,15 +506,12 @@
 
     # Prompt for administrator address, unless an override was given
     if( !$::opt_C and !$::opt_c ) {
-	paraprint <<EOF;
-A copy of this report can be sent to your local
-perl administrator. If the address is wrong, please
-correct it, or enter 'none' or 'yourself' to not send
-a copy.
-EOF
-	print "Local perl administrator [$cc]: ";
-	my $entry = scalar <>;
-	chomp $entry;
+	my $description =  <<EOF;
+$0 can send a copy of this report to your local perl
+administrator.  If the address below is wrong, please correct it,
+or enter 'none' or 'yourself' to not send a copy.
+EOF
+	my $entry = _prompt($description, "Local perl administrator", $cc);
 
 	if ($entry ne "") {
 	    $cc = $entry;
@@ -508,56 +520,59 @@
     }
 
     $cc = '' if $cc =~ /^(none|yourself|me|myself|ourselves)$/i;
-    $andcc = " and $cc" if $cc;
+    if ($cc) { 
+        $andcc = " and $cc" 
+    } else {
+        $andcc = ''
+    }
 
     # Prompt for editor, if no override is given
 editor:
     unless ($::opt_e || $::opt_f || $::opt_b) {
-	chomp (my $common_end = <<"EOF");
 
-You will probably want to use an editor to enter
-the report. If "$ed" is the editor you want
-to use, then just press Enter, otherwise type in
-the name of the editor you would like to use.
+    my $description;
 
-If you would like to use a prepared file, type
-"file", and you will be asked for the filename.
+	chomp (my $common_end = <<"EOF");
+You will probably want to use a text editor to enter the body of
+your report. If "$ed" is the editor you want to use, then just press
+Enter, otherwise type in the name of the editor you would like to
+use.
+
+If you have already composed the body of your report, you may enter
+"file", and $0 will prompt you to enter the name of the file
+containing your report.
 EOF
 
 	if ($thanks) {
-	    paraprint <<"EOF";
-Now you need to supply your thank-you message.
+	    $description = <<"EOF";
+It's now time to compose your thank-you message.
 
-Some information about your local perl configuration
-will automatically be included at the end of the message,
-because we're curious about the different ways that people
-build perl, but you're welcome to delete it if you wish.
+Some information about your local perl configuration will automatically
+be included at the end of your message, because we're curious about
+the different ways that people build and use perl. If you'd rather
+not share this information, you're welcome to delete it.
 
 $common_end
 EOF
 	} else {
-	    paraprint <<"EOF";
-Now you need to supply the bug report. Try to make
-the report concise but descriptive. Include any
-relevant detail. If you are reporting something
-that does not work as you think it should, please
-try to include example of both the actual
-result, and what you expected.
-
-Some information about your local
-perl configuration will automatically be included
-at the end of the report. If you are using any
-unusual version of perl, please try and confirm
-exactly which versions are relevant.
+	    $description =  <<"EOF";
+It's now time to compose your bug report. Try to make the report
+concise but descriptive. Please include any detail which you think
+might be relevant or might help the volunteers working to improve
+perl. If you are reporting something that does not work as you think
+it should, please try to include examples of the actual result and of
+what you expected.
+
+Some information about your local perl configuration will automatically
+be included at the end of your report. If you are using an unusual
+version of perl, it would be useful if you could confirm that you
+can replicate the problem on a standard build of perl as well.
 
 $common_end
 EOF
 	}
 
-	print "Editor [$ed]: ";
-	my $entry =scalar <>;
-	chomp $entry;
-
+    my $entry = _prompt($description, "Editor", $ed);
 	$usefile = 0;
 	if ($entry eq "file") {
 	    $usefile = 1;
@@ -565,27 +580,32 @@
 	    $ed = $entry;
 	}
     }
-    my $report_about_module = '';
     if ($::HaveCoreList && !$ok && !$thanks) {
-	paraprint <<EOF;
-Is your report about a Perl module? If yes, enter its name. If not, skip.
+	my $description =  <<EOF;
+If your bug is about a Perl module rather than a core language
+feature, please enter its name here. If it's not, just hit Enter
+to skip this question.
 EOF
-	print "Module []: ";
-	my $entry = scalar <>;
-	$entry =~ s/^\s+//s;
-	$entry =~ s/\s+$//s;
-	if ($entry ne q{}) {
-	    $category ||= 'library';
-	    $report_about_module = $entry;
+
+    my $entry = '';
+	while ($entry eq '') {
+        $entry = _prompt($description, 'Module');
 	    my $first_release = Module::CoreList->first_release($entry);
-	    unless ($first_release) {
+	    if ($entry and not $first_release) {
 		paraprint <<EOF;
-Module $entry is not a core module. Please check that
-you entered its name correctly. If it is correct,
-abort this program, try searching for $entry on
-search.cpan.org, and report it there.
-EOF
-	    }
+$entry is not a "core" Perl module. Please check that you entered
+its name correctly. If it is correct, quit this program, try searching
+for $entry on http://rt.cpan.org, and report your issue there.
+EOF
+	    
+            $entry = ''; 
+        } elsif ($entry) {
+	        $category ||= 'library';
+	        $report_about_module = $entry;
+            last;
+        } else {
+            last;
+        }
 	}
     }
 
@@ -601,25 +621,26 @@
     # Prompt for file to read report from, if needed
     if ($usefile and !$file) {
 filename:
-	paraprint <<EOF;
+	my $description = <<EOF;
 What is the name of the file that contains your report?
 EOF
-	print "Filename: ";
-	my $entry = scalar <>;
-	chomp $entry;
+	my $entry = _prompt($description, "Filename");
 
 	if ($entry eq "") {
 	    paraprint <<EOF;
-No filename? I'll let you go back and choose an editor again.
+It seems you didn't enter a filename. Please choose to use a text
+editor or enter a filename.
 EOF
 	    goto editor;
 	}
 
 	unless (-f $entry and -r $entry) {
 	    paraprint <<EOF;
-I'm sorry, but I can't read from '$entry'. Maybe you mistyped the name of
-the file? If you don't want to send a file, just enter a blank line and you
-can get back to the editor selection.
+'$entry' doesn't seem to be a readable file.  You may have mistyped
+its name or may not have permission to read it.
+
+If you don't want to use a file as the content of your report, just
+hit Enter and you'll be able to select a text editor instead.
 EOF
 	    goto filename;
 	}
@@ -651,18 +672,18 @@
 	    print REP <<'EOF';
 
 -----------------------------------------------------------------
-[Please enter your thank you message here]
+[Please enter your thank-you message here]
 
 
 
-[You're welcome to delete anything below this line if you prefer]
+[You're welcome to delete anything below this line]
 -----------------------------------------------------------------
 EOF
 	} else {
 	    print REP <<'EOF';
 
 -----------------------------------------------------------------
-[Please enter your report here]
+[Please describe your issue here]
 
 
 
@@ -674,15 +695,9 @@
     Dump(*REP);
     close(REP) or die "Error closing report file: $!";
 
-    # read in the report template once so that
-    # we can track whether the user does any editing.
-    # yes, *all* whitespace is ignored.
-    open(REP, "<$filename") or die "Unable to open report file '$filename': $!\n";
-    while (<REP>) {
-	s/\s+//g;
-	$REP{$_}++;
-    }
-    close(REP) or die "Error closing report file '$filename': $!";
+    # Set up an initial report fingerprint so we can compare it later
+    _fingerprint_lines_in_report();
+
 } # sub Query
 
 sub Dump {
@@ -694,6 +709,12 @@
     category=$category
     severity=$severity
 EFF
+
+    if ($report_about_module ) { 
+        print OUT <<EFF;
+    module=$report_about_module
+EFF
+    }
     if ($::opt_A) {
 	print OUT <<EFF;
     ack=no
@@ -759,78 +780,71 @@
 sub Edit {
     # Edit the report
     if ($usefile || $body) {
-	paraprint <<EOF;
-Please make sure that the name of the editor you want to use is correct.
-EOF
-	print "Editor [$ed]: ";
-	my $entry =scalar <>;
-	chomp $entry;
+	my $description = "Please make sure that the name of the editor you want to use is correct.";
+    my $entry = _prompt($description, 'Editor', $ed);
 	$ed = $entry unless $entry eq '';
     }
 
-tryagain:
-    my $sts;
-    $sts = system("$ed $filename") unless $Is_MacOS;
-    if ($Is_MacOS) {
-        require ExtUtils::MakeMaker;
-        ExtUtils::MM_MacOS::launch_file($filename);
-        paraprint <<EOF;
-Press Enter when done.
-EOF
-        scalar <>;
-    }
-    if ($sts) {
-	paraprint <<EOF;
-The editor you chose ('$ed') could apparently not be run!
-Did you mistype the name of your editor? If so, please
-correct it here, otherwise just press Enter.
-EOF
-	print "Editor [$ed]: ";
-	my $entry =scalar <>;
-	chomp $entry;
+    _edit_file($ed);
+}
 
-	if ($entry ne "") {
-	    $ed = $entry;
-	    goto tryagain;
-	} else {
-	    paraprint <<EOF;
-You may want to save your report to a file, so you can edit and mail it
-yourself.
-EOF
-	}
-    }
+sub _edit_file {
+    my $editor = shift;
 
-    return if ($ok and not $::opt_n) || $body;
-    # Check that we have a report that has some, eh, report in it.
-    my $unseen = 0;
-
-    open(REP, "<$filename") or die "Couldn't open '$filename': $!\n";
-    # a strange way to check whether any significant editing
-    # have been done: check whether any new non-empty lines
-    # have been added. Yes, the below code ignores *any* space
-    # in *any* line.
-    while (<REP>) {
-	s/\s+//g;
-	$unseen++ if $_ ne '' and not exists $REP{$_};
-    }
+    my $report_written = 0;
+
+    while ( !$report_written ) {
+        if ($Is_MacOS) {
+            require ExtUtils::MakeMaker;
+            ExtUtils::MM_MacOS::launch_file($filename);
+            _prompt('', "Press Enter when done." );
+        } else {    # we're not on oldschool mac os
+            my $exit_status = system("$editor $filename");
+            if ($exit_status) {
+                my $desc = <<EOF;
+The editor you chose ('$editor') could not be run!
+
+If you mistyped its name, please enter it now, otherwise just press Enter.
+EOF
+                my $entry = _prompt( $desc, 'Editor', $editor );
+                if ( $entry ne "" ) {
+                    $editor = $entry;
+                    next;
+                } else {
+                    paraprint <<EOF;
+You may want to save your report to a file, so you can edit and
+mail it later.
+EOF
+                    return;
+                }
+            }
+        }
+        return if ( $ok and not $::opt_n ) || $body;
+
+        # Check that we have a report that has some, eh, report in it.
+
+        unless ( _fingerprint_lines_in_report() ) {
+            my $description = <<EOF;
+It looks like you didn't enter a report. You may [r]etry your edit
+or [c]ancel this report.
+EOF
+            my $action = _prompt( $description, "Action (Retry/Cancel) " );
+            if ( $action =~ /^[re]/i ) {    # <R>etry <E>dit
+                next;
+            } elsif ( $action =~ /^[cq]/i ) {    # <C>ancel, <Q>uit
+                Cancel();                        # cancel exits
+            }
+        }
+        # Ok. the user did what they needed to;
+        return;
 
-    while ($unseen == 0) {
-	paraprint <<EOF;
-I am sorry but it looks like you did not report anything.
-EOF
-	print "Action (Retry Edit/Cancel) ";
-	my ($action) = scalar(<>);
-	if ($action =~ /^[re]/i) { # <R>etry <E>dit
-	    goto tryagain;
-	} elsif ($action =~ /^[cq]/i) { # <C>ancel, <Q>uit
-	    Cancel();
-	}
     }
-} # sub Edit
+}
+
 
 sub Cancel {
     1 while unlink($filename);  # remove all versions under VMS
-    print "\nCancelling.\n";
+    print "\nQuitting without sending your message.\n";
     exit(0);
 }
 
@@ -838,53 +852,33 @@
     # Report is done, prompt for further action
     if( !$::opt_S ) {
 	while(1) {
-	    paraprint <<EOF;
-Now that you have completed your report, would you like to send
-the message to $address$andcc, display the message on
-the screen, re-edit it, display/change the subject,
-or cancel without sending anything?
-You may also save the message as a file to mail at another time.
+	    my $menu = <<EOF;
+
+
+You have finished composing your message. At this point, you have 
+a few options. You can:
+
+    * [Se]end the message to $address$andcc, 
+    * [D]isplay the message on the screen,
+    * [R]e-edit the message
+    * Display or change the message's [su]bject
+    * Save the message to a [f]ile to mail at another time
+    * [Q]uit without sending a message
+
 EOF
       retry:
-	    print "Action (Send/Display/Edit/Subject/Save to File): ";
-	    my $action = scalar <>;
-	    chomp $action;
-
+        print $menu;
+	    my $action =  _prompt('', "Action (Send/Display/Edit/Subject/Save to File)");;
+        print "\n";
 	    if ($action =~ /^(f|sa)/i) { # <F>ile/<Sa>ve
-		my $file_save = $outfile || "$progname.rep";
-		print "\n\nName of file to save message in [$file_save]: ";
-		my $file = scalar <>;
-		chomp $file;
-		$file = $file_save if $file eq "";
-
-		unless (open(FILE, ">$file")) {
-		    print "\nError opening $file: $!\n\n";
-		    goto retry;
-		}
-		open(REP, "<$filename") or die "Couldn't open file '$filename': $!\n";
-		print FILE "To: $address\nSubject: $subject\n";
-		print FILE "Cc: $cc\n" if $cc;
-		print FILE "Reply-To: $from\n" if $from;
-		print FILE "Message-Id: $messageid\n" if $messageid;
-		print FILE "\n";
-		while (<REP>) { print FILE }
-		close(REP) or die "Error closing report file '$filename': $!";
-		close(FILE) or die "Error closing $file: $!";
-
-		print "\nMessage saved in '$file'.\n";
-		exit;
+            if ( SaveMessage() ) { exit }
 	    } elsif ($action =~ /^(d|l|sh)/i ) { # <D>isplay, <L>ist, <Sh>ow
 		# Display the message
 		open(REP, "<$filename") or die "Couldn't open file '$filename': $!\n";
 		while (<REP>) { print $_ }
 		close(REP) or die "Error closing report file '$filename': $!";
 	    } elsif ($action =~ /^su/i) { # <Su>bject
-		print "Subject: $subject\n";
-		print "If the above subject is fine, just press Enter.\n";
-		print "If not, type in the new subject.\n";
-		print "Subject: ";
-		my $reply = scalar <STDIN>;
-		chomp $reply;
+		my $reply = _prompt( "Subject: $subject", "If the above subject is fine, press Enter. Otherwise, type a replacement now\nSubject");
 		if ($reply ne '') {
 		    unless (TrivialSubject($reply)) {
 			$subject = $reply;
@@ -893,17 +887,12 @@
 		}
 	    } elsif ($action =~ /^se/i) { # <S>end
 		# Send the message
-		print "Are you certain you want to send this message?\n"
-		    . 'Please type "yes" if you are: ';
-		my $reply = scalar <STDIN>;
-		chomp $reply;
-		if ($reply eq "yes") {
+		my $reply =  _prompt( "Are you certain you want to send this message?", 'Please type "yes" if you are','no');
+		if ($reply =~ /^yes$/) {
 		    last;
 		} else {
 		    paraprint <<EOF;
-That wasn't a clear "yes", so I won't send your message. If you are sure
-your message should be sent, type in "yes" (without the quotes) at the
-confirmation prompt.
+You didn't type "yes", so your message has not yet been sent.
 EOF
 		}
 	    } elsif ($action =~ /^[er]/i) { # <E>dit, <R>e-edit
@@ -913,7 +902,7 @@
 		Cancel();
 	    } elsif ($action =~ /^s/i) {
 		paraprint <<EOF;
-I'm sorry, but I didn't understand that. Please type "send" or "save".
+The command you entered was ambiguous. Please type "send", "save" or "subject".
 EOF
 	    }
 	}
@@ -926,110 +915,69 @@
 	/^(y(es)?|no?|help|perl( (bug|problem))?|bug|problem)$/i ||
 	length($subject) < 4 ||
 	$subject !~ /\s/) {
-	print "\nThat doesn't look like a good subject.  Please be more verbose.\n\n";
+	print "\nThe subject you entered wasn't very descriptive. Please try again.\n\n";
         return 1;
     } else {
 	return 0;
     }
 }
 
+sub SaveMessage {
+    my $file_save = $outfile || "$progname.rep";
+    my $file = _prompt( '', "Name of file to save message in", $file_save );
+    save_message_to_disk($file) || return undef;
+    print "\n";
+    paraprint <<EOF;
+A copy of your message has been saved in '$file' for you to
+send to '$address' with your normal mail client.
+EOF
+}
+
 sub Send {
+
     # Message has been accepted for transmission -- Send the message
-    if ($outfile) {
-	open SENDMAIL, ">$outfile" or die "Couldn't open '$outfile': $!\n";
-	goto sendout;
-    }
 
-    # on linux certain mail implementations won't accept the subject
+    # on linux certain "mail" implementations won't accept the subject
     # as "~s subject" and thus the Subject header will be corrupted
     # so don't use Mail::Send to be safe
-    if ($::HaveSend && !$Is_Linux && !$Is_OpenBSD) {
-	$msg = new Mail::Send Subject => $subject, To => $address;
-	$msg->cc($cc) if $cc;
-	$msg->add("Reply-To",$from) if $from;
+    eval {
+        if ( $::HaveSend && !$Is_Linux && !$Is_OpenBSD ) {
+            _send_message_mailsend();
+        } elsif ($Is_VMS) {
+            _send_message_vms();
+        } else {
+            _send_message_sendmail();
+        }
+    };
 
-	$fh = $msg->open;
-	open(REP, "<$filename") or die "Couldn't open '$filename': $!\n";
-	while (<REP>) { print $fh $_ }
-	close(REP) or die "Error closing $filename: $!";
-	$fh->close;
+    if ( my $error = $@ ) {
+        paraprint <<EOF;
+$0 has detected an error while trying to send your message: $error.
 
-	print "\nMessage sent.\n";
-    } elsif ($Is_VMS) {
-	if ( ($address =~ /@/ and $address !~ /^\w+%"/) or
-	     ($cc      =~ /@/ and $cc      !~ /^\w+%"/) ) {
-	    my $prefix;
-	    foreach (qw[ IN MX SMTP UCX PONY WINS ], '') {
-		$prefix = "$_%", last if $ENV{"MAIL\$PROTOCOL_$_"};
-	    }
-	    $address = qq[${prefix}"$address"] unless $address =~ /^\w+%"/;
-	    $cc = qq[${prefix}"$cc"] unless !$cc || $cc =~ /^\w+%"/;
-	}
-	$subject =~ s/"/""/g; $address =~ s/"/""/g; $cc =~ s/"/""/g;
-	my $sts = system(qq[mail/Subject="$subject" $filename. "$address","$cc"]);
-	if ($sts) {
-	    die <<EOF;
-Can't spawn off mail
-	(leaving bug report in $filename): $sts
+Your message may not have been sent. You will now have a chance to save a copy to disk.
 EOF
-	}
-    } else {
-	my $sendmail = "";
-	for (qw(/usr/lib/sendmail /usr/sbin/sendmail /usr/ucblib/sendmail)) {
-	    $sendmail = $_, last if -e $_;
-	}
-	if ($^O eq 'os2' and $sendmail eq "") {
-	    my $path = $ENV{PATH};
-	    $path =~ s:\\:/: ;
-	    my @path = split /$Config{'path_sep'}/, $path;
-	    for (@path) {
-		$sendmail = "$_/sendmail", last if -e "$_/sendmail";
-		$sendmail = "$_/sendmail.exe", last if -e "$_/sendmail.exe";
-	    }
-	}
-
-	paraprint(<<"EOF"), die "\n" if $sendmail eq "";
-I am terribly sorry, but I cannot find sendmail, or a close equivalent, and
-the perl package Mail::Send has not been installed, so I can't send your bug
-report. We apologize for the inconvenience.
-
-So you may attempt to find some way of sending your message, it has
-been left in the file '$filename'.
-EOF
-	open(SENDMAIL, "|$sendmail -t -oi") || die "'|$sendmail -t -oi' failed: $!";
-sendout:
-	print SENDMAIL "To: $address\n";
-	print SENDMAIL "Subject: $subject\n";
-	print SENDMAIL "Cc: $cc\n" if $cc;
-	print SENDMAIL "Reply-To: $from\n" if $from;
-	print SENDMAIL "Message-Id: $messageid\n" if $messageid;
-	print SENDMAIL "\n\n";
-	open(REP, "<$filename") or die "Couldn't open '$filename': $!\n";
-	while (<REP>) { print SENDMAIL $_ }
-	close(REP) or die "Error closing $filename: $!";
-
-	if (close(SENDMAIL)) {
-	    printf "\nMessage %s.\n", $outfile ? "saved" : "sent";
-	} else {
-	    warn "\nSendmail returned status '", $? >> 8, "'\n";
-	}
+        SaveMessage();
+        return;
     }
-    1 while unlink($filename);  # remove all versions under VMS
-} # sub Send
+
+    1 while unlink($filename);    # remove all versions under VMS
+}    # sub Send
 
 sub Help {
     print <<EOF;
 
-A program to help generate bug reports about perl5, and mail them.
-It is designed to be used interactively. Normally no arguments will
-be needed.
+This program is designed to help you generate and send bug reports
+(and thank-you notes) about perl5 and the modules which ship with it.
+
+In most cases, you can just run "$0" interactively from a command
+line without any special arguments and follow the prompts.
+
+Advanced usage:
 
-Usage:
 $0  [-v] [-a address] [-s subject] [-b body | -f inpufile ] [ -F outputfile ]
     [-r returnaddress] [-e editor] [-c adminaddress | -C] [-S] [-t] [-h]
 $0  [-v] [-r returnaddress] [-A] [-ok | -okay | -nok | -nokay]
 
-Simplest usage:  run "$0", and follow the prompts.
 
 Options:
 
@@ -1083,7 +1031,6 @@
 
 sub paraprint {
     my @paragraphs = split /\n{2,}/, "@_";
-    print "\n\n";
     for (@paragraphs) {   # implicit local $_
 	s/(\S)\s*\n/$1 /g;
 	write;
@@ -1091,6 +1038,160 @@
     }
 }
 
+sub _prompt {
+    my ($explanation, $prompt, $default) = (@_);
+    if ($explanation) {
+        print "\n\n";
+        paraprint $explanation;
+    }
+    print $prompt. ($default ? " [$default]" :''). ": ";
+	my $result = scalar(<>);
+    chomp($result);
+	$result =~ s/^\s*(.*?)\s*$/$1/s;
+    if ($default && $result eq '') {
+        return $default;
+    } else {
+        return $result;
+    }
+}
+
+sub _build_header {
+    my %attr = (@_);
+
+    my $head = '';
+    for my $header (keys %attr) {
+        $head .= "$header: ".$attr{$header}."\n";
+    }
+    return $head;
+}
+
+sub _message_headers {
+    my %headers = ( To => $address, Subject => $subject );
+    $headers{'Cc'}         = $cc        if ($cc);
+    $headers{'Message-Id'} = $messageid if ($messageid);
+    $headers{'Reply-To'}   = $from      if ($from);
+    return \%headers;
+}
+
+sub build_complete_message {
+    my $content = _build_header(%{_message_headers()}) . "\n\n";
+    open( REP, "<$filename" ) or die "Couldn't open file '$filename': $!\n";
+    while (<REP>) { $content .= $_; }
+    close(REP) or die "Error closing report file '$filename': $!";
+    return $content;
+}
+
+sub save_message_to_disk {
+    my $file = shift;
+
+	    open OUTFILE, ">$file" or do { warn  "Couldn't open '$file': $!\n"; return undef};
+        print OUTFILE build_complete_message();
+        close(OUTFILE) or do { warn  "Error closing $file: $!"; return undef };
+	    print "\nMessage saved.\n";
+        return 1;
+}
+
+sub _send_message_vms {
+    if (   ( $address =~ /@/ and $address !~ /^\w+%"/ )
+        or ( $cc =~ /@/ and $cc !~ /^\w+%"/ ) ) {
+        my $prefix;
+        foreach ( qw[ IN MX SMTP UCX PONY WINS ], '' ) {
+            $prefix = "$_%", last if $ENV{"MAIL\$PROTOCOL_$_"};
+        }
+        $address = qq[${prefix}"$address"] unless $address =~ /^\w+%"/;
+        $cc = qq[${prefix}"$cc"] unless !$cc || $cc =~ /^\w+%"/;
+    }
+    $subject =~ s/"/""/g;
+    $address =~ s/"/""/g;
+    $cc      =~ s/"/""/g;
+    my $sts = system(qq[mail/Subject="$subject" $filename. "$address","$cc"]);
+    if ($sts) {
+        die "Can't spawn off mail (leaving bug report in $filename): $sts";
+    }
+}
+
+sub _send_message_mailsend {
+	my $msg = Mail::Send->new();
+    my %headers = %{_message_headers()};
+    for my $key ( keys %headers) {
+        $msg->add($key => $headers{$key});
+    }
+    
+	$fh = $msg->open;
+	open(REP, "<$filename") or die "Couldn't open '$filename': $!\n";
+	while (<REP>) { print $fh $_ }
+	close(REP) or die "Error closing $filename: $!";
+	$fh->close;
+
+	print "\nMessage sent.\n";
+}
+
+sub _probe_for_sendmail {
+    my $sendmail = "";
+    for (qw(/usr/lib/sendmail /usr/sbin/sendmail /usr/ucblib/sendmail)) {
+        $sendmail = $_, last if -e $_;
+    }
+    if ( $^O eq 'os2' and $sendmail eq "" ) {
+        my $path = $ENV{PATH};
+        $path =~ s:\\:/:;
+        my @path = split /$Config{'path_sep'}/, $path;
+        for (@path) {
+            $sendmail = "$_/sendmail",     last if -e "$_/sendmail";
+            $sendmail = "$_/sendmail.exe", last if -e "$_/sendmail.exe";
+        }
+    }
+    return $sendmail;
+}
+
+sub _send_message_sendmail {
+    my $sendmail = _probe_for_sendmail();
+    unless ($sendmail) {
+        paraprint(<<"EOF"), die "\n";
+It appears that there is no program which looks like "sendmail" on
+your system and that the Mail::Send library from CPAN isn't available.
+Because of this, there's no easy way to automatically send your
+message.
+
+A copy of your message has been saved in '$filename' for you to
+send to '$address' with your normal mail client.
+EOF
+    }
+
+    open( SENDMAIL, "|$sendmail -t -oi" )
+        || die "'|$sendmail -t -oi' failed: $!";
+    print SENDMAIL build_complete_message();
+    if ( close(SENDMAIL) ) {
+        print "\nMessage sent\n";
+    } else {
+        warn "\nSendmail returned status '", $? >> 8, "'\n";
+    }
+}
+
+
+
+# a strange way to check whether any significant editing
+# has been done: check whether any new non-empty lines
+# have been added. 
+
+sub _fingerprint_lines_in_report {
+    my $new_lines = 0;
+    # read in the report template once so that
+    # we can track whether the user does any editing.
+    # yes, *all* whitespace is ignored.
+    
+    open(REP, "<$filename") or die "Unable to open report file '$filename': $!\n";
+    while (my $line = <REP>) {
+    	$line =~ s/\s+//g;
+        $new_lines++ if (!$REP{$line}); 
+	    $REP{$line}++;
+    }
+    close(REP) or die "Error closing report file '$filename': $!";
+    # returns the number of lines with content that wasn't there when last we looked
+    return $new_lines;
+}
+
+
+
 format STDOUT =
 ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~
 $_
@@ -1104,6 +1205,8 @@
 
 =head1 SYNOPSIS
 
+B<perlbug>
+
 B<perlbug> S<[ B<-v> ]> S<[ B<-a> I<address> ]> S<[ B<-s> I<subject> ]>
 S<[ B<-b> I<body> | B<-f> I<inputfile> ]> S<[ B<-F> I<outputfile> ]>
 S<[ B<-r> I<returnaddress> ]>
@@ -1115,25 +1218,33 @@
 
 =head1 DESCRIPTION
 
-A program to help generate bug reports about perl or the modules that
-come with it, and mail them.
 
-If you have found a bug with a non-standard port (one that was not part
-of the I<standard distribution>), a binary distribution, or a
-non-standard module (such as Tk, CGI, etc), then please see the
-documentation that came with that distribution to determine the correct
-place to report bugs.
-
-C<perlbug> is designed to be used interactively. Normally no arguments
-will be needed.  Simply run it, and follow the prompts.
-
-If you are unable to run B<perlbug> (most likely because you don't have
-a working setup to send mail that perlbug recognizes), you may have to
-compose your own report, and email it to B<perlbug@perl.org>.  You might
-find the B<-d> option useful to get summary information in that case.
+This program is designed to help you generate and send bug reports
+(and thank-you notes) about perl5 and the modules which ship with it.
+
+In most cases, you can just run it interactively from a command
+line without any special arguments and follow the prompts.
 
-In any case, when reporting a bug, please make sure you have run through
-this checklist:
+If you have found a bug with a non-standard port (one that was not
+part of the I<standard distribution>), a binary distribution, or a
+non-core module (such as Tk, DBI, etc), then please see the
+documentation that came with that distribution to determine the
+correct place to report bugs.
+
+If you are unable to send your report using B<perlbug> (most likely
+because your system doesn't have a way to send mail that perlbug
+recognizes), you may be able to use this tool to compose your report
+and save it to a file which you can then send to B<perlbug@perl.org>
+using your regular mail client.
+
+In extreme cases, B<perlbug> may not work well enough on your system
+to guide you through composing a bug report. In those cases, you
+may be able to use B<perlbug -d> to get system configuration
+information to include in a manually composed bug report to
+B<perlbug@perl.org>.
+
+
+When reporting a bug, please run through this checklist:
 
 =over 4
 
@@ -1143,110 +1254,136 @@
 
 =item Are you running the latest released version of perl?
 
-Look at http://www.perl.com/ to find out.  If it is not the latest
-released version, get that one and see whether your bug has been
-fixed.  Note that bug reports about old versions of Perl, especially
-those prior to the 5.0 release, are likely to fall upon deaf ears.
-You are on your own if you continue to use perl1 .. perl4.
+Look at http://www.perl.org/ to find out.  If you are not using the
+latest released version, please try to replicate your bug on the
+latest stable release.
+
+Note that reports about bugs in old versions of Perl, especially
+those which indicate you haven't also tested the current stable
+release of Perl, are likely to receive less attention from the
+volunteers who build and maintain Perl than reports about bugs in
+the current release.
+
+This tool isn't apropriate for reporting bugs in any version
+prior to Perl 5.0.
 
 =item Are you sure what you have is a bug?
 
-A significant number of the bug reports we get turn out to be documented
-features in Perl.  Make sure the behavior you are witnessing doesn't fall
-under that category, by glancing through the documentation that comes
-with Perl (we'll admit this is no mean task, given the sheer volume of
-it all, but at least have a look at the sections that I<seem> relevant).
-
-Be aware of the familiar traps that perl programmers of various hues
-fall into.  See L<perltrap>.
-
-Check in L<perldiag> to see what any Perl error message(s) mean.
-If message isn't in perldiag, it probably isn't generated by Perl.
-Consult your operating system documentation instead.
+A significant number of the bug reports we get turn out to be
+documented features in Perl.  Make sure the issue you've run into
+isn't intentional by glancing through the documentation that comes
+with the Perl distribution.
+
+Given the sheer volume of Perl documentation, this isn't a trivial
+undertaking, but if you can point to documentation that suggests
+the behaviour you're seeing is I<wrong>, your issue is likely to
+receive more attention. You may want to start with B<perldoc>
+L<perltrap> for pointers to common traps that new (and experienced)
+Perl programmers run into.
+
+If you're unsure of the meaning of an error message you've run
+across, B<perldoc> L<perldiag> for an explanation.  If the message
+isn't in perldiag, it probably isn't generated by Perl.  You may
+have luck consulting your operating system documentation instead.
 
-If you are on a non-UNIX platform check also L<perlport>, as some
+If you are on a non-UNIX platform B<perldoc> L<perlport>, as some
 features may be unimplemented or work differently.
 
-Try to study the problem under the Perl debugger, if necessary.
-See L<perldebug>.
+You may be able to figure out what's going wrong using the Perl
+debugger.  For information about how to use the debugger B<perldoc>
+L<perldebug>.
 
 =item Do you have a proper test case?
 
 The easier it is to reproduce your bug, the more likely it will be
-fixed, because if no one can duplicate the problem, no one can fix it.
-A good test case has most of these attributes: fewest possible number
-of lines; few dependencies on external commands, modules, or
-libraries; runs on most platforms unimpeded; and is self-documenting.
-
-A good test case is almost always a good candidate to be on the perl
-test suite.  If you have the time, consider making your test case so
-that it will readily fit into the standard test suite.
+fixed --  if nobody can duplicate your problem, it probably won't be 
+addressed.
+
+A good test case has most of these attributes: short, simple code;
+few dependencies on external commands, modules, or libraries; no
+platform-dependent code (unless it's a platform-specific bug);
+clear, simple documentation.
+
+A good test case is almost always a good candidate to be included in
+Perl's test suite.  If you have the time, consider writing your test case so
+that it can be easily included into the standard test suite.
+
+=item Have you included all relevant information?
 
-Remember also to include the B<exact> error messages, if any.
-"Perl complained something" is not an exact error message.
+Be sure to include the B<exact> error messages, if any.
+"Perl gave an error" is not an exact error message.
 
 If you get a core dump (or equivalent), you may use a debugger
 (B<dbx>, B<gdb>, etc) to produce a stack trace to include in the bug
-report.  NOTE: unless your Perl has been compiled with debug info
+report.  
+
+NOTE: unless your Perl has been compiled with debug info
 (often B<-g>), the stack trace is likely to be somewhat hard to use
 because it will most probably contain only the function names and not
 their arguments.  If possible, recompile your Perl with debug info and
-reproduce the dump and the stack trace.
+reproduce the crash and the stack trace.
 
 =item Can you describe the bug in plain English?
 
-The easier it is to understand a reproducible bug, the more likely it
-will be fixed.  Anything you can provide by way of insight into the
-problem helps a great deal.  In other words, try to analyze the
-problem (to the extent you can) and report your discoveries.
+The easier it is to understand a reproducible bug, the more likely
+it will be fixed.  Any insight you can provide into the problem
+will help a great deal.  In other words, try to analyze the problem
+(to the extent you can) and report your discoveries.
 
 =item Can you fix the bug yourself?
 
 A bug report which I<includes a patch to fix it> will almost
-definitely be fixed.  Use the C<diff> program to generate your patches
-(C<diff> is being maintained by the GNU folks as part of the B<diffutils>
-package, so you should be able to get it from any of the GNU software
-repositories).  If you do submit a patch, the cool-dude counter at
-perlbug@perl.org will register you as a savior of the world.  Your
-patch may be returned with requests for changes, or requests for more
+definitely be fixed.  When sending a patch, please use the C<diff>
+program with the C<-u> option to generate "unified" diff files.
+Bug reports with patches are likely to receive significantly more
+attention and interest than those without patches.
+
+Your patch may be returned with requests for changes, or requests for more
 detailed explanations about your fix.
 
-Here are some clues for creating quality patches: Use the B<-c> or
-B<-u> switches to the diff program (to create a so-called context or
-unified diff).  Make sure the patch is not reversed (the first
-argument to diff is typically the original file, the second argument
-your changed file).  Make sure you test your patch by applying it with
-the C<patch> program before you send it on its way.  Try to follow the
-same style as the code you are trying to patch.  Make sure your patch
-really does work (C<make test>, if the thing you're patching supports
-it).
+Here are a few hints for creating high-quality patches:
+
+Make sure the patch is not reversed (the first argument to diff is
+typically the original file, the second argument your changed file).
+Make sure you test your patch by applying it with the C<patch>
+program before you send it on its way.  Try to follow the same style
+as the code you are trying to patch.  Make sure your patch really
+does work (C<make test>, if the thing you're patching is covered
+by Perl's test suite).
 
 =item Can you use C<perlbug> to submit the report?
 
 B<perlbug> will, amongst other things, ensure your report includes
-crucial information about your version of perl.  If C<perlbug> is unable
-to mail your report after you have typed it in, you may have to compose
-the message yourself, add the output produced by C<perlbug -d> and email
-it to B<perlbug@perl.org>.  If, for some reason, you cannot run
-C<perlbug> at all on your system, be sure to include the entire output
-produced by running C<perl -V> (note the uppercase V).
+crucial information about your version of perl.  If C<perlbug> is
+unable to mail your report after you have typed it in, you may have
+to compose the message yourself, add the output produced by C<perlbug
+-d> and email it to B<perlbug@perl.org>.  If, for some reason, you
+cannot run C<perlbug> at all on your system, be sure to include the
+entire output produced by running C<perl -V> (note the uppercase V).
 
 Whether you use C<perlbug> or send the email manually, please make
-your Subject line informative.  "a bug" not informative.  Neither is
-"perl crashes" nor "HELP!!!".  These don't help.
-A compact description of what's wrong is fine.
+your Subject line informative.  "a bug" is not informative.  Neither
+is "perl crashes" nor is "HELP!!!".  These don't help.  A compact
+description of what's wrong is fine.
 
 =back
 
-Having done your bit, please be prepared to wait, to be told the bug
-is in your code, or even to get no reply at all.  The Perl maintainers
-are busy folks, so if your problem is a small one or if it is difficult
-to understand or already known, they may not respond with a personal reply.
+Having done your bit, please be prepared to wait, to be told the
+bug is in your code, or possibly to get no reply at all.  The
+volunteers who maintain Perl are busy folks, so if your problem is
+an obvious bug in your own code, is difficult to understand or is
+a duplicate of an existing report, you may not receive a personal
+reply.
+
 If it is important to you that your bug be fixed, do monitor the
-C<Changes> file in any development releases since the time you submitted
-the bug, and encourage the maintainers with kind words (but never any
-flames!).  Feel free to resend your bug report if the next released
-version of perl comes out and your bug is still present.
+perl5-porters@perl.org mailing list and the commit logs to development
+versions of Perl, and encourage the maintainers with kind words or
+offers of frosty beverages.  (Please do be kind to the maintainers.
+Harassing or flaming them is likely to have the opposite effect of
+the one you want.)
+
+Feel free to update the ticket about your bug on http://rt.perl.org
+if a new version of Perl is released and your bug is still present.
 
 =head1 OPTIONS
 
@@ -1356,15 +1493,16 @@
 
 =head1 AUTHORS
 
-Kenneth Albanowski (E<lt>kjahds@kjahds.comE<gt>), subsequently I<doc>tored
-by Gurusamy Sarathy (E<lt>gsar@activestate.comE<gt>), Tom Christiansen
-(E<lt>tchrist@perl.comE<gt>), Nathan Torkington (E<lt>gnat@frii.comE<gt>),
-Charles F. Randall (E<lt>cfr@pobox.comE<gt>), Mike Guy
-(E<lt>mjtg@cam.a.ukE<gt>), Dominic Dunlop (E<lt>domo@computer.orgE<gt>),
-Hugo van der Sanden (E<lt>hv@crypt.org<gt>),
+Kenneth Albanowski (E<lt>kjahds@kjahds.comE<gt>), subsequently
+I<doc>tored by Gurusamy Sarathy (E<lt>gsar@activestate.comE<gt>),
+Tom Christiansen (E<lt>tchrist@perl.comE<gt>), Nathan Torkington
+(E<lt>gnat@frii.comE<gt>), Charles F. Randall (E<lt>cfr@pobox.comE<gt>),
+Mike Guy (E<lt>mjtg@cam.a.ukE<gt>), Dominic Dunlop
+(E<lt>domo@computer.orgE<gt>), Hugo van der Sanden (E<lt>hv@crypt.org<gt>),
 Jarkko Hietaniemi (E<lt>jhi@iki.fiE<gt>), Chris Nandor
 (E<lt>pudge@pobox.comE<gt>), Jon Orwant (E<lt>orwant@media.mit.eduE<gt>,
-and Richard Foley (E<lt>richard@rfi.netE<gt>).
+Richard Foley (E<lt>richard@rfi.netE<gt>), and Jesse Vincent
+(E<lt>jesse@bestpractical.com<gt>).
 
 =head1 SEE ALSO