Merge branch 'maint'

* maint: send-email: multiedit is a boolean config option
git-mirror · Jan 9, 2012 · e1e3c06 · e1e3c06
2 parents eac2d83 + 829a1c6
commit e1e3c06
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/git-send-email.perl b/git-send-email.perl
@@ -210,6 +210,7 @@ sub do_edit {
     "signedoffbycc" => [\$signed_off_by_cc, undef],
     "signedoffcc" => [\$signed_off_by_cc, undef],      # Deprecated
     "validate" => [\$validate, 1],
+    "multiedit" => [\$multiedit, undef]
 );
 
 my %config_settings = (
@@ -227,7 +228,6 @@ sub do_edit {
     "bcc" => \@bcclist,
     "suppresscc" => \@suppress_cc,
     "envelopesender" => \$envelope_sender,
-    "multiedit" => \$multiedit,
     "confirm"   => \$confirm,
     "from" => \$sender,
     "assume8bitencoding" => \$auto_8bit_encoding,