summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog17
-rw-r--r--generic/tkTextTag.c4
2 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b14572..cbfc390 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,16 @@
+2005-12-08 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * generic/tkTextTag.c (TkTextTagCmd): use correct arraySize for
+ peered text widgets in [$text tag names]. [Bug 1375069 1374935]
+
2005-12-08 Daniel Steffen <das@users.sourceforge.net>
- * macosx/tkMacOSXDraw.c: remove inclusion of tclInt.h and use of tcl
- * macosx/tkMacOSXFont.c: internals wherever possible in tk/macosx, the
- * macosx/tkMacOSXInit.c: only remaining tcl internals in TkAqua are
- * macosx/tkMacOSXNotify.c: TclServiceIdle() in tkMacOSXScrlbr.c and
- * macosx/tkMacOSXScrlbr.c: Tcl_Get/SetStartupScript() in tkMacOSXInit.c
- [Bug 1336531].
+ * macosx/tkMacOSXDraw.c: remove inclusion of tclInt.h and use of tcl
+ * macosx/tkMacOSXFont.c: internals wherever possible in tk/macosx, the
+ * macosx/tkMacOSXInit.c: only remaining tcl internals in TkAqua are
+ * macosx/tkMacOSXNotify.c: TclServiceIdle() in tkMacOSXScrlbr.c and
+ * macosx/tkMacOSXScrlbr.c: Tcl_Get/SetStartupScript() in tkMacOSXInit.c
+ [Bug 1336531].
* macosx/tkMacOSXInt.h: sync comments with core-8-4-branch.
diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c
index 900fff6..703a271 100644
--- a/generic/tkTextTag.c
+++ b/generic/tkTextTag.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkTextTag.c,v 1.22 2005/11/17 10:57:35 dkf Exp $
+ * RCS: @(#) $Id: tkTextTag.c,v 1.23 2005/12/08 18:17:32 hobbs Exp $
*/
#include "default.h"
@@ -624,7 +624,7 @@ TkTextTagCmd(
*/
arrayPtr[i] = textPtr->selTagPtr;
- arraySize = textPtr->sharedTextPtr->numTags;
+ arraySize = ++i;
} else {
if (TkTextGetObjIndex(interp, textPtr, objv[3],
&index1) != TCL_OK) {