Merge branch 'dd/send-email-reedit'

"git send-email" can sometimes offer confirmation dialog "Send this
email?" with choices 'Yes', 'No', 'Quit', and 'All'.  A new action
'Edit' has been added to this dialog's choice.

* dd/send-email-reedit:
git-send-email: allow re-editing of message

diff --combined git-send-email.perl
index 7157397fd03a0791b7722ab49aa696181977381c,b45953733a3ed253055d4af340a45c1d259c4ae3..8ec70e58ed5c4caace7701549038b63f9a3e9aad
--- 1/git-send-email.perl
--- 2/git-send-email.perl
+++ b/git-send-email.perl
@@@ -1330,9 -1330,14 +1330,14 @@@ sub file_name_is_absolute 
        return File::Spec::Functions::file_name_is_absolute($path);
  }
  
- # Returns 1 if the message was sent, and 0 otherwise.
- # In actuality, the whole program dies when there
- # is an error sending a message.
+ # Prepares the email, then asks the user what to do.
+ #
+ # If the user chooses to send the email, it's sent and 1 is returned.
+ # If the user chooses not to send the email, 0 is returned.
+ # If the user decides they want to make further edits, -1 is returned and the
+ # caller is expected to call send_message again after the edits are performed.
+ #
+ # If an error occurs sending the email, this just dies.
  
  sub send_message {
        my @recipients = unique_email_list(@to);
@@@ -1404,15 -1409,17 +1409,17 @@@ Message-Id: $message_i
  
  EOF
                }
-               # TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
+               # TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
                # translation. The program will only accept English input
                # at this point.
-               $_ = ask(__("Send this email? ([y]es|[n]o|[q]uit|[a]ll): "),
-                        valid_re => qr/^(?:yes|y|no|n|quit|q|all|a)/i,
+               $_ = ask(__("Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "),
+                        valid_re => qr/^(?:yes|y|no|n|edit|e|quit|q|all|a)/i,
                         default => $ask_default);
                die __("Send this email reply required") unless defined $_;
                if (/^n/i) {
                        return 0;
+               } elsif (/^e/i) {
+                       return -1;
                } elsif (/^q/i) {
                        cleanup_compose_files();
                        exit(0);
@@@ -1552,7 -1559,12 +1559,12 @@@ $references = $initial_in_reply_to || '
  $subject = $initial_subject;
  $message_num = 0;
  
- foreach my $t (@files) {
+ # Prepares the email, prompts the user, sends it out
+ # Returns 0 if an edit was done and the function should be called again, or 1
+ # otherwise.
+ sub process_file {
+       my ($t) = @_;
+ 
        open my $fh, "<", $t or die sprintf(__("can't open file %s"), $t);
  
        my $author = undef;
@@@ -1642,15 -1654,10 +1654,15 @@@
                        elsif (/^Content-Transfer-Encoding: (.*)/i) {
                                $xfer_encoding = $1 if not defined $xfer_encoding;
                        }
 +                      elsif (/^In-Reply-To: (.*)/i) {
 +                              $in_reply_to = $1;
 +                      }
 +                      elsif (/^References: (.*)/i) {
 +                              $references = $1;
 +                      }
                        elsif (!/^Date:\s/i && /^[-A-Za-z]+:\s+\S/) {
                                push @xh, $_;
                        }
 -
                } else {
                        # In the traditional
                        # "send lots of email" format,
@@@ -1760,6 -1767,10 +1772,10 @@@
        }
  
        my $message_was_sent = send_message();
+       if ($message_was_sent == -1) {
+               do_edit($t);
+               return 0;
+       }
  
        # set up for the next message
        if ($thread && $message_was_sent &&
@@@ -1781,6 -1792,14 +1797,14 @@@
                undef $auth;
                sleep($relogin_delay) if defined $relogin_delay;
        }
+ 
+       return 1;
+ }
+ 
+ foreach my $t (@files) {
+       while (!process_file($t)) {
+               # user edited the file
+       }
  }
  
  # Execute a command (e.g. $to_cmd) to get a list of email addresses