command_prompt -> command_mail_reply_prompt

10 files changed, 31 insertions, 31 deletions

diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index 09c72063..a13e9eea 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -115,6 +115,7 @@ command {
 
    command_mail { 
           $command_mail_line_length_limit
+    ?     $command_mail_reply_prompt
           $use_command_mail_program
    }
 
@@ -143,7 +144,6 @@ command {
    }
 
    command_* {
-    ?     $command_prompt
           $command_restrictions
    }
 }
diff --git a/fml/doc/en/tutorial/variables/list.sgml b/fml/doc/en/tutorial/variables/list.sgml
index c0c13880..877d786b 100644
--- a/fml/doc/en/tutorial/variables/list.sgml
+++ b/fml/doc/en/tutorial/variables/list.sgml
@@ -330,6 +330,15 @@ command_mail_line_length_limit</entry>
 </row>
 <row>
 <entry>
+command_mail_reply_prompt</entry>
+<entry>
+ command prompt in message reply</entry>
+<entry>
+>>>
+   </entry>
+</row>
+<row>
+<entry>
 command_mail_size_filter_rules</entry>
 <entry>
  size based filter rules.</entry>
@@ -352,15 +361,6 @@ command_mail_valid_command_limit</entry>
 </row>
 <row>
 <entry>
-command_prompt</entry>
-<entry>
- command prompt in message reply</entry>
-<entry>
->>>
-   </entry>
-</row>
-<row>
-<entry>
 command_restrictions</entry>
 <entry>
  restrictions for command mail</entry>
diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index 09c72063..a13e9eea 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -115,6 +115,7 @@ command {
 
    command_mail { 
           $command_mail_line_length_limit
+    ?     $command_mail_reply_prompt
           $use_command_mail_program
    }
 
@@ -143,7 +144,6 @@ command {
    }
 
    command_* {
-    ?     $command_prompt
           $command_restrictions
    }
 }
diff --git a/fml/doc/ja/tutorial/variables/list.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index 3d1288da..2c4ff85b 100644
--- a/fml/doc/ja/tutorial/variables/list.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -330,6 +330,15 @@ command_mail_line_length_limit</entry>
 </row>
 <row>
 <entry>
+command_mail_reply_prompt</entry>
+<entry>
+ command prompt in message reply</entry>
+<entry>
+>>>
+   </entry>
+</row>
+<row>
+<entry>
 command_mail_size_filter_rules</entry>
 <entry>
  フィルタリングのルール。</entry>
@@ -352,15 +361,6 @@ command_mail_valid_command_limit</entry>
 </row>
 <row>
 <entry>
-command_prompt</entry>
-<entry>
- command prompt in message reply</entry>
-<entry>
->>>
-   </entry>
-</row>
-<row>
-<entry>
 command_restrictions</entry>
 <entry>
  コマンドへの制限</entry>
diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index e595dc3b..40a09b7e 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -1334,7 +1334,7 @@ command_mail_line_length_limit	=	128
 #      History: hard coded in fml (< 4.0)
 #        Value: string without spaces
 #     Examples: >>>
-command_prompt			=	>>>
+command_mail_reply_prompt			=	>>>
 
 
 # Descriptions: use comnfirmation in subscribe command ?
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index 058ec2c3..9b7389b2 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -1375,7 +1375,7 @@ command_mail_line_length_limit	=	128
 #      History: hard coded in fml (< 4.0)
 #        Value: string without spaces
 #     Examples: >>>
-command_prompt			=	>>>
+command_mail_reply_prompt			=	>>>
 
 
 # Descriptions: subscribe コマンドで confirmation 認証(コールバック認証)
diff --git a/fml/etc/src/config.cf.en/command.cf b/fml/etc/src/config.cf.en/command.cf
index aa6e9142..798e2061 100644
--- a/fml/etc/src/config.cf.en/command.cf
+++ b/fml/etc/src/config.cf.en/command.cf
@@ -124,7 +124,7 @@ command_mail_line_length_limit	=	128
 #      History: hard coded in fml (< 4.0)
 #        Value: string without spaces
 #     Examples: >>>
-command_prompt			=	>>>
+command_mail_reply_prompt			=	>>>
 
 
 # Descriptions: use comnfirmation in subscribe command ?
diff --git a/fml/etc/src/config.cf.ja/command.cf b/fml/etc/src/config.cf.ja/command.cf
index ef5c2875..b756df11 100644
--- a/fml/etc/src/config.cf.ja/command.cf
+++ b/fml/etc/src/config.cf.ja/command.cf
@@ -138,7 +138,7 @@ command_mail_line_length_limit	=	128
 #      History: hard coded in fml (< 4.0)
 #        Value: string without spaces
 #     Examples: >>>
-command_prompt			=	>>>
+command_mail_reply_prompt			=	>>>
 
 
 # Descriptions: subscribe コマンドで confirmation 認証(コールバック認証)
diff --git a/fml/lib/FML/Command/User/chaddr.pm b/fml/lib/FML/Command/User/chaddr.pm
index dcf58f54..e56f8b28 100644
--- a/fml/lib/FML/Command/User/chaddr.pm
+++ b/fml/lib/FML/Command/User/chaddr.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: chaddr.pm,v 1.21 2003/08/23 07:24:43 fukachan Exp $
+# $FML: chaddr.pm,v 1.22 2003/08/29 15:34:00 fukachan Exp $
 #
 
 package FML::Command::User::chaddr;
@@ -104,7 +104,7 @@ sub process
     $optargs->{ recipient } = [ $sender, $old_addr, $new_addr ];
 
     # prompt again (since recipient differs)
-    my $prompt  = $config->{ command_prompt } || '>>>';
+    my $prompt  = $config->{ command_mail_reply_prompt } || '>>>';
     $curproc->reply_message("\n$prompt $command", $optargs);
 
     # if either old or new addresses in chaddr arguments is an ML member,
diff --git a/fml/lib/FML/Process/Command.pm b/fml/lib/FML/Process/Command.pm
index eb8278da..c7a70506 100644
--- a/fml/lib/FML/Process/Command.pm
+++ b/fml/lib/FML/Process/Command.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2000,2001,2002,2003 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Command.pm,v 1.88 2003/08/23 07:24:46 fukachan Exp $
+# $FML: Command.pm,v 1.89 2003/08/29 15:34:06 fukachan Exp $
 #
 
 package FML::Process::Command;
@@ -318,7 +318,7 @@ sub _config_permit_command
     my ($curproc, $args, $level, $opts) = @_;
     my $config  = $curproc->config();
     my $cred    = $curproc->{ credential }; # user credential
-    my $prompt  = $config->{ command_prompt } || '>>>';
+    my $prompt  = $config->{ command_mail_reply_prompt } || '>>>';
     my $comname = $opts->{ comname };
     my $command = $opts->{ command };
 
@@ -355,7 +355,7 @@ sub _is_safe_syntax
 {
     my ($curproc, $args, $status, $cominfo) = @_;
     my $config  = $curproc->config();
-    my $prompt  = $config->{ command_prompt } || '>>>';
+    my $prompt  = $config->{ command_mail_reply_prompt } || '>>>';
     my $level   = $status->{ level };
     my $command = $cominfo->{ command };
 
@@ -737,7 +737,7 @@ sub __stop_here
 {
     my ($curproc, $args, $status, $cominfo, $orig_command) = @_;
     my $config  = $curproc->config();
-    my $prompt  = $config->{ command_prompt } || '>>>';
+    my $prompt  = $config->{ command_mail_reply_prompt } || '>>>';
     my $key     = $status->{ _stop_reason_key };
     my $str     = $status->{ _stop_reason_str };
 
@@ -767,7 +767,7 @@ sub _evaluate_command_lines
     my $config  = $curproc->config();
     my $ml_name = $config->{ ml_name };
     my $argv    = $curproc->command_line_argv();
-    my $prompt  = $config->{ command_prompt } || '>>>';
+    my $prompt  = $config->{ command_mail_reply_prompt } || '>>>';
     my $mode    = 'unknown';
     my $rbody   = $curproc->incoming_message_body();
     my $msg     = $rbody->find_first_plaintext_message();