Tk Source Code

Check-in [a26d55ff]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Don't increase the epoch twice.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-5-branch
Files: files | file ages | folders
SHA1: a26d55ff4a72dfdd41b5a83983874efb52ff8714
User & Date: fvogel 2012-01-25 21:33:10
Context
2012-01-25
22:06
Bug-2433260: non-critical error in Tk_PhotoPutBlock check-in: 53c0922f user: jan.nijtmans tags: core-8-5-branch
21:56
[Bug-1754043] and [Bug-2321450]: When -blockcursor is true, the cursor appears as a blinking bar which expands to the right edge of the widget. Closed-Leaf check-in: 85c4a00f user: fvogel tags: patch-3479498
21:35
Don't increase the epoch twice. check-in: 16d8b47d user: fvogel tags: trunk
21:33
Don't increase the epoch twice. check-in: a26d55ff user: fvogel tags: core-8-5-branch
21:13
[Bug-1630271]: segfault/infinite loop when a mark is before -startline check-in: 61a3685a user: jan.nijtmans tags: core-8-5-branch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ChangeLog.





1
2
3
4
5
6
7




2012-01-25  Francois Vogel  <[email protected]>

	* generic/tkText.c:      [Bug-1630271]: segfault/infinite loop
	* generic/tkTextMark.c:  when a mark is before -startline
	* tests/textMark.test:

2012-01-25  Francois Vogel  <[email protected]>
>
>
>
>







1
2
3
4
5
6
7
8
9
10
11
2012-01-25  Francois Vogel  <[email protected]>

	* generic/tkText.c: Don't increase the epoch twice

2012-01-25  Francois Vogel  <[email protected]>

	* generic/tkText.c:      [Bug-1630271]: segfault/infinite loop
	* generic/tkTextMark.c:  when a mark is before -startline
	* tests/textMark.test:

2012-01-25  Francois Vogel  <[email protected]>

Changes to generic/tkText.c.

2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
	TkTextMarkNameToIndex(textPtr, "current", &index3);
	if (TkTextIndexCmp(&index3, &index1) < 0) {
	    textPtr->currentMarkPtr = TkTextSetMark(textPtr, "current", &index1);
	}
	if (TkTextIndexCmp(&index3, &index2) > 0) {
	    textPtr->currentMarkPtr = TkTextSetMark(textPtr, "current", &index2);
	}
        textPtr->sharedTextPtr->stateEpoch++;
    }

    /*
     * Don't allow negative spacings.
     */

    if (textPtr->spacing1 < 0) {







<







2120
2121
2122
2123
2124
2125
2126

2127
2128
2129
2130
2131
2132
2133
	TkTextMarkNameToIndex(textPtr, "current", &index3);
	if (TkTextIndexCmp(&index3, &index1) < 0) {
	    textPtr->currentMarkPtr = TkTextSetMark(textPtr, "current", &index1);
	}
	if (TkTextIndexCmp(&index3, &index2) > 0) {
	    textPtr->currentMarkPtr = TkTextSetMark(textPtr, "current", &index2);
	}

    }

    /*
     * Don't allow negative spacings.
     */

    if (textPtr->spacing1 < 0) {