From 1c7088abb1b65b2bf0b5796351330c332c8cd6de Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Wed, 26 Mar 2008 19:34:52 +0000
Subject:         * changes:      Updates for 8.5.2 release.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

        * unix/tkUnixCursor.c:  Stop crash in [. configure -cursor] on X11.
        Thanks to emiliano gavilán.  [Bug 1922466]
---
 ChangeLog           |  7 +++++++
 changes             | 10 ++++++++--
 unix/tkUnixCursor.c |  6 +++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c4ec21f..35bfbef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-26  Don Porter  <dgp@users.sourceforge.net>
+
+	* changes:	Updates for 8.5.2 release.
+
+	* unix/tkUnixCursor.c:	Stop crash in [. configure -cursor] on X11.
+	Thanks to emiliano gavilán.  [Bug 1922466]
+
 2008-03-26  Joe English  <jenglish@users.sourceforge.net>
 
 	* generic/tkInt.h, generic/tkEvent.c, unix/tkUnixEvent.c, 
diff --git a/changes b/changes
index 124149d..1e53fe7 100644
--- a/changes
+++ b/changes
@@ -2,7 +2,7 @@ This file summarizes all changes made to Tk since version 1.0 was
 released on March 13, 1991.  Changes that aren't backward compatible
 are marked specially.
 
-RCS: @(#) $Id: changes,v 1.128 2008/03/13 14:56:00 dgp Exp $
+RCS: @(#) $Id: changes,v 1.129 2008/03/26 19:34:52 dgp Exp $
 
 3/16/91 (bug fix) Modified tkWindow.c to remove Tk's Tcl commands from
 the interpreter when the main window is deleted (otherwise there will
@@ -6490,4 +6490,10 @@ Several documentation and release notes improvements
 
 2008-03-12 (bug fix)[1090382] crash when GetFont() fails (jenglish)
 
---- Released 8.5.2, March 14, 2008 --- See ChangeLog for details ---
+2008-03-13 (enhancement) support space in INSTALL_ROOT or $builddir (steffen)
+
+2008-03-21 (bug fix)[1863007,1920030] Export Ttk stubs table (english)
+
+2008-03-26 (bug fix)[1922466] crash  in [. configure -cursor] (gavilán)
+
+--- Released 8.5.2, March 28, 2008 --- See ChangeLog for details ---
diff --git a/unix/tkUnixCursor.c b/unix/tkUnixCursor.c
index 03bac45..d57db13 100644
--- a/unix/tkUnixCursor.c
+++ b/unix/tkUnixCursor.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkUnixCursor.c,v 1.12 2007/12/13 15:28:50 dgp Exp $
+ * RCS: @(#) $Id: tkUnixCursor.c,v 1.13 2008/03/26 19:34:53 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -493,7 +493,7 @@ CreateCursorFromTableOrFile(
      * If there is no mask data, then create the cursor now.
      */
 
-    if ((!inTkTable && (argc == 2)) || (tkCursorPtr->mask == NULL)) {
+    if ((!inTkTable && (argc == 2)) || (inTkTable && tkCursorPtr->mask == NULL)) {
 	cursor = XCreatePixmapCursor(display, source, source,
 		&fg, &fg, (unsigned) xHot, (unsigned) yHot);
 	goto cleanup;
@@ -532,7 +532,7 @@ CreateCursorFromTableOrFile(
 	}
     }
 
-    if ((maskWidth != width) && (maskHeight != height)) {
+    if ((maskWidth != width) || (maskHeight != height)) {
 	Tcl_SetResult(interp, "source and mask bitmaps have different sizes",
 		TCL_STATIC);
 	goto cleanup;
-- 
cgit v0.12