summaryrefslogtreecommitdiffstats
path: root/generic/tkTextIndex.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-12-04 16:37:18 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-12-04 16:37:18 (GMT)
commit5ae5c226312e499948f5934d1d1e14e33265099b (patch)
treeb0fdcc8a70e63856b4cd8894cb579d21f1365a7a /generic/tkTextIndex.c
parentf4da5583aaf7d522caa95c64a2d6614622ab4e88 (diff)
parentebdb1af200a5bdf041a872601852a6b93ae20900 (diff)
downloadtk-5ae5c226312e499948f5934d1d1e14e33265099b.zip
tk-5ae5c226312e499948f5934d1d1e14e33265099b.tar.gz
tk-5ae5c226312e499948f5934d1d1e14e33265099b.tar.bz2
[Bug 3588824]: bug in image index handling for weird image names
Diffstat (limited to 'generic/tkTextIndex.c')
-rw-r--r--generic/tkTextIndex.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c
index a9b0bed..70c94db 100644
--- a/generic/tkTextIndex.c
+++ b/generic/tkTextIndex.c
@@ -758,9 +758,11 @@ GetIndex(
/*
*---------------------------------------------------------------------
- * Stage 1: check to see if the index consists of nothing but a mark name.
- * We do this check now even though it's also done later, in order to
- * allow mark names that include funny characters such as spaces or "+1c".
+ * Stage 1: check to see if the index consists of nothing but a mark
+ * name, an embedded window or an embedded image. We do this check
+ * now even though it's also done later, in order to allow mark names,
+ * embedded window names or image names that include funny characters
+ * such as spaces or "+1c".
*---------------------------------------------------------------------
*/
@@ -768,6 +770,14 @@ GetIndex(
goto done;
}
+ if (TkTextWindowIndex(textPtr, string, indexPtr) != 0) {
+ return TCL_OK;
+ }
+
+ if (TkTextImageIndex(textPtr, string, indexPtr) != 0) {
+ return TCL_OK;
+ }
+
/*
*------------------------------------------------
* Stage 2: start again by parsing the base index.