summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclVar.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8da3d2f..5746f87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-20 Miguel Sofer <msofer@users.sf.net>
+
+ * generic/tclVar.c: fix flag bit collision between
+ LOOKUP_FOR_UPVAR and TCL_PARSE_PART1 (deprecated) [Bug 835020]
+
2003-11-20 Vince Darley <vincentdarley@users.sourceforge.net>
* generic/tclIOUtil.c:
diff --git a/generic/tclVar.c b/generic/tclVar.c
index a46b2d3..80089b6 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -15,7 +15,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclVar.c,v 1.69.2.3 2003/05/12 17:31:51 msofer Exp $
+ * RCS: @(#) $Id: tclVar.c,v 1.69.2.4 2003/11/20 19:19:03 msofer Exp $
*/
#include "tclInt.h"
@@ -616,7 +616,7 @@ TclObjLookupVar(interp, part1Ptr, part2, flags, msg, createPart1, createPart2,
* namespace; never follow the second (global) resolution path
* - Bug #631741 - do not use special namespace or interp resolvers
*/
-#define LOOKUP_FOR_UPVAR 0x400
+#define LOOKUP_FOR_UPVAR 0x40000
/*
*----------------------------------------------------------------------