summaryrefslogtreecommitdiffstats
path: root/generic/tkText.c
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-01-21 03:54:41 (GMT)
committerhobbs <hobbs>2000-01-21 03:54:41 (GMT)
commit77936f61de844b8c795063558eda7de3508cdd7b (patch)
treeae734edf048def5a9ec5f3c9eca846a6753fbd01 /generic/tkText.c
parent45572469ec5bc7b41c213ee56f0a7db17bfc8cb8 (diff)
downloadtk-77936f61de844b8c795063558eda7de3508cdd7b.zip
tk-77936f61de844b8c795063558eda7de3508cdd7b.tar.gz
tk-77936f61de844b8c795063558eda7de3508cdd7b.tar.bz2
* generic/tkInt.h: moved new TkDisplay useInputMethods structure
element to end to not disturb position of previous elements in the structure (as compared to Tk <=8.2). * generic/tkCanvLine.c (LineCoords): fixed segfault when too few coords were passed to a line with certain options set (it should always have thrown an error anyway). [Bug: 4042] * tests/text.test: * generic/tkText.c: fixed missing " in error case and missing 'dump' in subcommand listing [Bug: 4036] * generic/tkListbox.c: adjusted use of basic string concatenation in (non-K&R behavior) [Bug: 4027] Swapped bg/fg class for -select(bg|fg) for listbox and their items [Bug: 4039]
Diffstat (limited to 'generic/tkText.c')
-rw-r--r--generic/tkText.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkText.c b/generic/tkText.c
index 393a0a9..cc3db83 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -14,7 +14,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkText.c,v 1.11 2000/01/12 11:45:03 hobbs Exp $
+ * RCS: @(#) $Id: tkText.c,v 1.12 2000/01/21 03:54:42 hobbs Exp $
*/
#include "default.h"
@@ -771,8 +771,8 @@ TextWidgetCmd(clientData, interp, argc, argv)
} else {
Tcl_AppendResult(interp, "bad option \"", argv[1],
"\": must be bbox, cget, compare, configure, debug, delete, ",
- "dlineinfo, get, image, index, insert, mark, scan, search, see, ",
- "tag, window, xview, or yview",
+ "dlineinfo, dump, get, image, index, insert, mark, scan, ",
+ "search, see, tag, window, xview, or yview",
(char *) NULL);
result = TCL_ERROR;
}
@@ -1695,8 +1695,8 @@ TextSearchCmd(textPtr, interp, argc, argv)
if (length < 2) {
badSwitch:
Tcl_AppendResult(interp, "bad switch \"", arg,
- "\": must be -forward, -backward, -exact, -regexp, ",
- "-nocase, -count, -elide, or --", (char *) NULL);
+ "\": must be --, -backward, -count, -elide, -exact, ",
+ "-forward, -nocase, or -regexp", (char *) NULL);
return TCL_ERROR;
}
c = arg[1];
@@ -1738,7 +1738,7 @@ TextSearchCmd(textPtr, interp, argc, argv)
argsLeft = argc - (i+2);
if ((argsLeft != 0) && (argsLeft != 1)) {
Tcl_AppendResult(interp, "wrong # args: should be \"",
- argv[0], " search ?switches? pattern index ?stopIndex?",
+ argv[0], " search ?switches? pattern index ?stopIndex?\"",
(char *) NULL);
return TCL_ERROR;
}