From b7d5c914b5af4512f6eabc9ae4e9b3c49003a59f Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 21 Aug 2009 19:06:05 +0000
Subject:         * generic/tclFileName.c: Correct regression in [Bug 2837800]
 fix.         * tests/fileName.test:

---
 ChangeLog             | 5 +++++
 generic/tclFileName.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0aaed72..db4e7b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-21  Don Porter  <dgp@users.sourceforge.net>
+
+	* generic/tclFileName.c: Correct regression in [Bug 2837800] fix.
+	* tests/fileName.test:
+
 2009-08-20  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tclFileName.c: Correct result from [glob */test] when *
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index ad71008..1070c42 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclFileName.c,v 1.97 2009/08/20 22:09:45 dgp Exp $
+ * RCS: @(#) $Id: tclFileName.c,v 1.98 2009/08/21 19:06:06 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -2369,7 +2369,7 @@ DoGlob(
 	    for (i=0; result==TCL_OK && i<subdirc; i++) {
 		Tcl_Obj *copy = NULL;
 
-		if (Tcl_GetString(subdirv[i])[0] == '~') {
+		if (pathPtr == NULL && Tcl_GetString(subdirv[i])[0] == '~') {
 		    Tcl_ListObjLength(NULL, matchesObj, &repair);
 		    copy = subdirv[i];
 		    subdirv[i] = Tcl_NewStringObj("./", 2);
-- 
cgit v0.12