svnno****@sourc*****
svnno****@sourc*****
2010年 9月 1日 (水) 23:00:04 JST
Tera TermRevision: 4079
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4079
Author: maya
Date: 2010-09-01 23:00:04 +0900 (Wed, 01 Sep 2010)
Log Message:
-----------
box 系マクãƒã‚³ãƒžãƒ³ãƒ‰ã® special 引数を無効ã«ã—ãŸ
互æ›æ€§ã®ãŸã‚ã€ã‚¨ãƒ©ãƒ¼ã«ã¯ãªã‚‰ãªã„ãŒå˜ã«ç„¡è¦–ã•ã‚Œã‚‹ã‚ˆã†ã«ã—ãŸ
Modified Paths:
--------------
trunk/doc/en/html/macro/command/inputbox.html
trunk/doc/en/html/macro/command/messagebox.html
trunk/doc/en/html/macro/command/passwordbox.html
trunk/doc/en/html/macro/command/statusbox.html
trunk/doc/en/html/macro/command/yesnobox.html
trunk/doc/ja/html/macro/command/inputbox.html
trunk/doc/ja/html/macro/command/messagebox.html
trunk/doc/ja/html/macro/command/passwordbox.html
trunk/doc/ja/html/macro/command/statusbox.html
trunk/doc/ja/html/macro/command/yesnobox.html
trunk/teraterm/ttpmacro/ttl.c
-------------- next part --------------
Modified: trunk/doc/en/html/macro/command/inputbox.html
===================================================================
--- trunk/doc/en/html/macro/command/inputbox.html 2010-08-31 14:29:58 UTC (rev 4078)
+++ trunk/doc/en/html/macro/command/inputbox.html 2010-09-01 14:00:04 UTC (rev 4079)
@@ -18,7 +18,7 @@
</p>
<pre class="macro-syntax">
-inputbox <message> <title> [<default> [<special>]]
+inputbox <message> <title> [<default> [<special>(obsolete)]]
</pre>
<h2>Remarks</h2>
@@ -32,29 +32,9 @@
</p>
<p>
-If <special> is non-zero, following strings in <message> is treated as spacial character.<br>
-If <special> is not specified then 1 is used.
+<special> is an obsolete parameter. It has not effect.
</p>
-<table>
- <tr>
- <th>input</th>
- <th>output</th>
- </tr>
- <tr>
- <td>\\</td>
- <td>"\"</td>
- </tr>
- <tr>
- <td>\n</td>
- <td>line feed</td>
- </tr>
- <tr>
- <td>\t</td>
- <td>tab</td>
- </tr>
-</table>
-
<h2>Example</h2>
<pre class="macro-example">
Modified: trunk/doc/en/html/macro/command/messagebox.html
===================================================================
--- trunk/doc/en/html/macro/command/messagebox.html 2010-08-31 14:29:58 UTC (rev 4078)
+++ trunk/doc/en/html/macro/command/messagebox.html 2010-09-01 14:00:04 UTC (rev 4079)
@@ -18,7 +18,7 @@
</p>
<pre class="macro-syntax">
-messagebox <message> <title> [<special>]
+messagebox <message> <title> [<special>(obsolete)]
</pre>
<h2>Remarks</h2>
@@ -28,29 +28,9 @@
</p>
<p>
-If <special> is non-zero, following strings in <message> is treated as spacial character.<br>
-If <special> is not specified then 1 is used.
+<special> is an obsolete parameter. It has not effect.
</p>
-<table>
- <tr>
- <th>input</th>
- <th>output</th>
- </tr>
- <tr>
- <td>\\</td>
- <td>"\"</td>
- </tr>
- <tr>
- <td>\n</td>
- <td>line feed</td>
- </tr>
- <tr>
- <td>\t</td>
- <td>tab</td>
- </tr>
-</table>
-
<h2>Example</h2>
<pre class="macro-example">
@@ -58,6 +38,7 @@
title="Five lines display"
message="First line\nSecond line\nThird line\nFourth line\nFifth line\n"
+strspecial message
messagebox message title
</pre>
Modified: trunk/doc/en/html/macro/command/passwordbox.html
===================================================================
--- trunk/doc/en/html/macro/command/passwordbox.html 2010-08-31 14:29:58 UTC (rev 4078)
+++ trunk/doc/en/html/macro/command/passwordbox.html 2010-09-01 14:00:04 UTC (rev 4079)
@@ -18,7 +18,7 @@
</p>
<pre class="macro-syntax">
-passwordbox <message> <title> [<special>]
+passwordbox <message> <title> [<special>(obsolete)]
</pre>
<h2>Remarks</h2>
@@ -33,29 +33,9 @@
</p>
<p>
-If <special> is non-zero, following strings in <message> is treated as spacial character.<br>
-If <special> is not specified then 1 is used.
+<special> is an obsolete parameter. It has not effect.
</p>
-<table>
- <tr>
- <th>input</th>
- <th>output</th>
- </tr>
- <tr>
- <td>\\</td>
- <td>"\"</td>
- </tr>
- <tr>
- <td>\n</td>
- <td>line feed</td>
- </tr>
- <tr>
- <td>\t</td>
- <td>tab</td>
- </tr>
-</table>
-
<h2>Example</h2>
<pre class="macro-example">
Modified: trunk/doc/en/html/macro/command/statusbox.html
===================================================================
--- trunk/doc/en/html/macro/command/statusbox.html 2010-08-31 14:29:58 UTC (rev 4078)
+++ trunk/doc/en/html/macro/command/statusbox.html 2010-09-01 14:00:04 UTC (rev 4079)
@@ -18,7 +18,7 @@
</p>
<pre class="macro-syntax">
-statusbox <message> <title> [<special>]
+statusbox <message> <title> [<special>(obsolete)]
</pre>
<h2>Remarks</h2>
@@ -34,29 +34,9 @@
</p>
<p>
-If <special> is non-zero, following strings in <message> is treated as spacial character.<br>
-If <special> is not specified then 1 is used.
+<special> is an obsolete parameter. It has not effect.
</p>
-<table>
- <tr>
- <th>input</th>
- <th>output</th>
- </tr>
- <tr>
- <td>\\</td>
- <td>"\"</td>
- </tr>
- <tr>
- <td>\n</td>
- <td>line feed</td>
- </tr>
- <tr>
- <td>\t</td>
- <td>tab</td>
- </tr>
-</table>
-
<h2>Example</h2>
<pre class="macro-example">
Modified: trunk/doc/en/html/macro/command/yesnobox.html
===================================================================
--- trunk/doc/en/html/macro/command/yesnobox.html 2010-08-31 14:29:58 UTC (rev 4078)
+++ trunk/doc/en/html/macro/command/yesnobox.html 2010-09-01 14:00:04 UTC (rev 4079)
@@ -18,7 +18,7 @@
</p>
<pre class="macro-syntax">
-yesnobox <message> <title> [<special>]
+yesnobox <message> <title> [<special>(obsolete)]
</pre>
<h2>Remarks</h2>
@@ -32,29 +32,9 @@
</p>
<p>
-If <special> is non-zero, following strings in <message> is treated as spacial character.<br>
-If <special> is not specified then 1 is used.
+<special> is an obsolete parameter. It has not effect.
</p>
-<table>
- <tr>
- <th>input</th>
- <th>output</th>
- </tr>
- <tr>
- <td>\\</td>
- <td>"\"</td>
- </tr>
- <tr>
- <td>\n</td>
- <td>line feed</td>
- </tr>
- <tr>
- <td>\t</td>
- <td>tab</td>
- </tr>
-</table>
-
<h2>Example</h2>
<pre class="macro-example">
Modified: trunk/doc/ja/html/macro/command/inputbox.html
===================================================================
--- trunk/doc/ja/html/macro/command/inputbox.html 2010-08-31 14:29:58 UTC (rev 4078)
+++ trunk/doc/ja/html/macro/command/inputbox.html 2010-09-01 14:00:04 UTC (rev 4079)
@@ -18,7 +18,7 @@
</p>
<pre class="macro-syntax">
-inputbox <message> <title> [<default> [<special>]]
+inputbox <message> <title> [<default> [<special>(”pŽ~)]]
</pre>
<h2>‰ðà</h2>
@@ -32,29 +32,9 @@
</p>
<p>
-<special> ‚ª 0 ‚Å‚È‚¢ê‡‚ÍA<message> ‚ÉŠÜ‚Ü‚ê‚éˆÈ‰º‚Ì•¶Žš—ñ‚Í“ÁŽê•¶Žš‚Æ‚µ‚Ĉµ‚í‚ê‚Ü‚·B<br>
-<special> ‚ªŽw’肳‚ê‚È‚¢ê‡‚Í 1 ‚ªŽg—p‚³‚ê‚Ü‚·B
+<special> ‚Í”pŽ~‚³‚ê‚Ü‚µ‚½BƒGƒ‰[‚É‚Í‚È‚è‚Ü‚¹‚ñ‚ªA–³Œø‚Å‚·B
</p>
-<table>
- <tr>
- <th>“ü—Í</th>
- <th>o—Í</th>
- </tr>
- <tr>
- <td>\\</td>
- <td>"\"</td>
- </tr>
- <tr>
- <td>\n</td>
- <td>‰üs</td>
- </tr>
- <tr>
- <td>\t</td>
- <td>ƒ^ƒu</td>
- </tr>
-</table>
-
<h2>—á</h2>
<pre class="macro-example">
Modified: trunk/doc/ja/html/macro/command/messagebox.html
===================================================================
--- trunk/doc/ja/html/macro/command/messagebox.html 2010-08-31 14:29:58 UTC (rev 4078)
+++ trunk/doc/ja/html/macro/command/messagebox.html 2010-09-01 14:00:04 UTC (rev 4079)
@@ -18,7 +18,7 @@
</p>
<pre class="macro-syntax">
-messagebox <message> <title> [<special>]
+messagebox <message> <title> [<special>(”pŽ~)]
</pre>
<h2>‰ðà</h2>
@@ -28,29 +28,9 @@
</p>
<p>
-<special> ‚ª 0 ‚Å‚È‚¢ê‡‚ÍA<message> ‚ÉŠÜ‚Ü‚ê‚éˆÈ‰º‚Ì•¶Žš—ñ‚Í“ÁŽê•¶Žš‚Æ‚µ‚Ĉµ‚í‚ê‚éB<br>
-<special> ‚ªŽw’肳‚ê‚È‚¢ê‡‚Í 1 ‚ªŽg—p‚³‚ê‚éB
+<special> ‚Í”pŽ~‚³‚ê‚Ü‚µ‚½BƒGƒ‰[‚É‚Í‚È‚è‚Ü‚¹‚ñ‚ªA–³Œø‚Å‚·B
</p>
-<table>
- <tr>
- <th>“ü—Í</th>
- <th>o—Í</th>
- </tr>
- <tr>
- <td>\\</td>
- <td>"\"</td>
- </tr>
- <tr>
- <td>\n</td>
- <td>‰üs</td>
- </tr>
- <tr>
- <td>\t</td>
- <td>ƒ^ƒu</td>
- </tr>
-</table>
-
<h2>—á</h2>
<pre class="macro-example">
@@ -58,6 +38,7 @@
title="5s•\Ž¦"
message="1s–Ú\n2s–Ú\n3s–Ú\n4s–Ú\n5s–Ú\n"
+strspecial message
messagebox message title
</pre>
Modified: trunk/doc/ja/html/macro/command/passwordbox.html
===================================================================
--- trunk/doc/ja/html/macro/command/passwordbox.html 2010-08-31 14:29:58 UTC (rev 4078)
+++ trunk/doc/ja/html/macro/command/passwordbox.html 2010-09-01 14:00:04 UTC (rev 4079)
@@ -18,7 +18,7 @@
</p>
<pre class="macro-syntax">
-passwordbox <message> <title> [<special>]
+passwordbox <message> <title> [<special>(”pŽ~)]
</pre>
<h2>‰ðà</h2>
@@ -33,29 +33,9 @@
</p>
<p>
-<special> ‚ª 0 ‚Å‚È‚¢ê‡‚ÍA<message> ‚ÉŠÜ‚Ü‚ê‚éˆÈ‰º‚Ì•¶Žš—ñ‚Í“ÁŽê•¶Žš‚Æ‚µ‚Ĉµ‚í‚ê‚Ü‚·B<br>
-<special> ‚ªŽw’肳‚ê‚È‚¢ê‡‚Í 1 ‚ªŽg—p‚³‚ê‚Ü‚·B
+<special> ‚Í”pŽ~‚³‚ê‚Ü‚µ‚½BƒGƒ‰[‚É‚Í‚È‚è‚Ü‚¹‚ñ‚ªA–³Œø‚Å‚·B
</p>
-<table>
- <tr>
- <th>“ü—Í</th>
- <th>o—Í</th>
- </tr>
- <tr>
- <td>\\</td>
- <td>"\"</td>
- </tr>
- <tr>
- <td>\n</td>
- <td>‰üs</td>
- </tr>
- <tr>
- <td>\t</td>
- <td>ƒ^ƒu</td>
- </tr>
-</table>
-
<h2>—á</h2>
<pre class="macro-example">
Modified: trunk/doc/ja/html/macro/command/statusbox.html
===================================================================
--- trunk/doc/ja/html/macro/command/statusbox.html 2010-08-31 14:29:58 UTC (rev 4078)
+++ trunk/doc/ja/html/macro/command/statusbox.html 2010-09-01 14:00:04 UTC (rev 4079)
@@ -18,7 +18,7 @@
</p>
<pre class="macro-syntax">
-statusbox <message> <title> [<special>]
+statusbox <message> <title> [<special>(”pŽ~)]
</pre>
<h2>‰ðà</h2>
@@ -34,29 +34,9 @@
</p>
<p>
-<special> ‚ª 0 ‚Å‚È‚¢ê‡‚ÍA<message> ‚ÉŠÜ‚Ü‚ê‚éˆÈ‰º‚Ì•¶Žš—ñ‚Í“ÁŽê•¶Žš‚Æ‚µ‚Ĉµ‚í‚ê‚Ü‚·B<br>
-<special> ‚ªŽw’肳‚ê‚È‚¢ê‡‚Í 1 ‚ªŽg—p‚³‚ê‚Ü‚·B
+<special> ‚Í”pŽ~‚³‚ê‚Ü‚µ‚½BƒGƒ‰[‚É‚Í‚È‚è‚Ü‚¹‚ñ‚ªA–³Œø‚Å‚·B
</p>
-<table>
- <tr>
- <th>“ü—Í</th>
- <th>o—Í</th>
- </tr>
- <tr>
- <td>\\</td>
- <td>"\"</td>
- </tr>
- <tr>
- <td>\n</td>
- <td>‰üs</td>
- </tr>
- <tr>
- <td>\t</td>
- <td>ƒ^ƒu</td>
- </tr>
-</table>
-
<h2>—á</h2>
<pre class="macro-example">
Modified: trunk/doc/ja/html/macro/command/yesnobox.html
===================================================================
--- trunk/doc/ja/html/macro/command/yesnobox.html 2010-08-31 14:29:58 UTC (rev 4078)
+++ trunk/doc/ja/html/macro/command/yesnobox.html 2010-09-01 14:00:04 UTC (rev 4079)
@@ -18,7 +18,7 @@
</p>
<pre class="macro-syntax">
-yesnobox <message> <title> [<special>]
+yesnobox <message> <title> [<special>(”pŽ~)]
</pre>
<h2>‰ðà</h2>
@@ -32,29 +32,9 @@
</p>
<p>
-<special> ‚ª 0 ‚Å‚È‚¢ê‡‚ÍA<message> ‚ÉŠÜ‚Ü‚ê‚éˆÈ‰º‚Ì•¶Žš—ñ‚Í“ÁŽê•¶Žš‚Æ‚µ‚Ĉµ‚í‚ê‚Ü‚·B<br>
-<special> ‚ªŽw’肳‚ê‚È‚¢ê‡‚Í 1 ‚ªŽg—p‚³‚ê‚Ü‚·B
+<special> ‚Í”pŽ~‚³‚ê‚Ü‚µ‚½BƒGƒ‰[‚É‚Í‚È‚è‚Ü‚¹‚ñ‚ªA–³Œø‚Å‚·B
</p>
-<table>
- <tr>
- <th>“ü—Í</th>
- <th>o—Í</th>
- </tr>
- <tr>
- <td>\\</td>
- <td>"\"</td>
- </tr>
- <tr>
- <td>\n</td>
- <td>‰üs</td>
- </tr>
- <tr>
- <td>\t</td>
- <td>ƒ^ƒu</td>
- </tr>
-</table>
-
<h2>—á</h2>
<pre class="macro-example">
Modified: trunk/teraterm/ttpmacro/ttl.c
===================================================================
--- trunk/teraterm/ttpmacro/ttl.c 2010-08-31 14:29:58 UTC (rev 4078)
+++ trunk/teraterm/ttpmacro/ttl.c 2010-09-01 14:00:04 UTC (rev 4079)
@@ -2187,7 +2187,7 @@
{
TStrVal Str1, Str2, Str3;
WORD Err, ValType, VarId, P;
- int sp = 1;
+ int sp;
Err = 0;
GetStrVal(Str1,&Err);
@@ -2209,6 +2209,7 @@
}
// get 4th(3rd) arg(optional) if given
+ // this parameter is not used.
if (CheckParameterGiven()) {
GetIntVal(&sp, &Err);
}
@@ -2217,9 +2218,6 @@
Err = ErrSyntax;
if (Err!=0) return Err;
- if (sp) {
- RestoreNewLine(Str1);
- }
SetInputStr("");
if (CheckVar("inputstr",&ValType,&VarId) &&
(ValType==TypString))
@@ -2365,7 +2363,7 @@
int MessageCommand(int BoxId, LPWORD Err)
{
TStrVal Str1, Str2;
- int sp = 1;
+ int sp;
int ret;
*Err = 0;
@@ -2374,6 +2372,7 @@
if (*Err!=0) return 0;
// get 3rd arg(optional) if given
+ // this parameter is not used.
if (CheckParameterGiven()) {
GetIntVal(&sp, Err);
}
@@ -2382,9 +2381,6 @@
*Err = ErrSyntax;
if (*Err!=0) return 0;
- if (sp) {
- RestoreNewLine(Str1);
- }
if (BoxId==IdMsgBox) {
ret = OpenMsgDlg(Str1,Str2,FALSE);
// ƒƒbƒZ[ƒWƒ{ƒbƒNƒX‚ðƒLƒƒƒ“ƒZƒ‹‚·‚é‚ÆAƒ}ƒNƒ‚ÌI—¹‚Æ‚·‚éB