summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--doc/text.n5
-rw-r--r--generic/tkTextDisp.c5
3 files changed, 17 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d0b040c..fa73d52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2012-05-25 Jan Nijtmans <nijtmans@users.sf.net>
+2012-05-30 Jan Nijtmans <nijtmans@users.sf.net>
* generic/tkWindow.c: Simpify determination whether we are running on cygwin.
* generic/tkStubInit.c: Export Tk_GetHINSTANCE, TkSetPixmapColormap and
@@ -7,6 +7,16 @@
* generic/tk*Decls.h: re-generated
* win/Makefile.in: Fix "make genstubs" when cross-compiling on UNIX
+2012-05-28 Francois Vogel <fvogelnew1@free.fr>
+
+ * doc/text.n: [Bug 1630251]: Documentation for -endline option was wrong
+
+2012-05-28 Francois Vogel <fvogelnew1@free.fr>
+
+ * generic/tkTextDisp.c: [Bug 1630254]: missing scrolling of text widget
+ when from a -startline == -endline initial state it is configured to display
+ a non-empty part of it
+
2012-05-24 Jan Nijtmans <nijtmans@users.sf.net>
* win/stubs.c: Change XSetCommand signature to match Xorg,
diff --git a/doc/text.n b/doc/text.n
index 860bb89..cd595c8 100644
--- a/doc/text.n
+++ b/doc/text.n
@@ -40,8 +40,9 @@ should be drawn as a character-sized rectangular block. If false
.VE 8.5
.OP \-endline endLine EndLine
.VS 8.5
-Specifies an integer line index representing the last line of the
-underlying textual data store that should be contained in the widget.
+Specifies an integer line index representing the line of the underlying
+textual data store that should be just after the last line contained in
+the widget.
This allows a text widget to reflect only a portion of a larger piece
of text. Instead of an integer, the empty string can be provided to
this configuration option, which will configure the widget to end
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index d82949f..2516e1c 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -2007,8 +2007,9 @@ UpdateDisplayInfo(
* widget.
*/
- lineNum = -1;
- bytesToCount = 0; /* Stop compiler warning. */
+ lineNum = TkBTreeNumLines(textPtr->sharedTextPtr->tree,
+ textPtr) - 1;
+ bytesToCount = INT_MAX;
} else {
lineNum = TkBTreeLinesTo(textPtr,
dInfoPtr->dLinePtr->index.linePtr);