Converted [glob [file join]] to [glob -directory] (Bug #223313)

Also cleaned up a few space/tab issues in the ChangeLog which make a
difference if you're using a highlighting editor like emacs...

2 files changed, 26 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 2efd6fb..56a2143 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-10  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
+
+	* library/demos/image2.tcl (loadDir): Converted non-portable
+	[glob [file join $dirName *]] to [glob -directory $dirName *]
+	which is both fully portable and more reliable when directory
+	names contain glob-significant characters.  [Bug 223313]
+
 2001-08-08  Don Porter <dgp@users.sourceforge.net>
 
 	* tests/dialog.test:  New file testing [tk_dialog].
@@ -6,15 +13,15 @@
 	* library/tkfbox.tcl: Corrections to problems introduced by
 	the TIP 44 changes.  [Bug 449261]
 
-        * README:
-        * generic/tk.h:
-        * unix/configure:
-        * unix/configure.in:
-        * unix/tk.spec:
-        * win/configure:
-        * win/configure.in: Bumped up patchlevel to 8.4a4 to distinguish
-        CVS snapshots from the 8.4a3 release.  This does not necessarily
-        mean there will be an 8.4a4 release.  [Bug 448938].
+	* README:
+	* generic/tk.h:
+	* unix/configure:
+	* unix/configure.in:
+	* unix/tk.spec:
+	* win/configure:
+	* win/configure.in: Bumped up patchlevel to 8.4a4 to distinguish
+	CVS snapshots from the 8.4a3 release.  This does not necessarily
+	mean there will be an 8.4a4 release.  [Bug 448938].
 
 2001-08-07  Jeff Hobbs  <jeffh@ActiveState.com>
 
@@ -667,10 +674,10 @@
 
 2001-02-12  D. Richard Hipp  <drh@hwaci.com>
 
-        TIP #21: Asymmetric padding in the pack and grid geometry managers.
-        With this changes, you can now say "-padx {10 20}" to put 10 pixels
-        of padding on the left and 20 on the right.  Similar rules apply
-        for vertical padding.  See the revised documentation for details.
+	TIP #21: Asymmetric padding in the pack and grid geometry managers.
+	With this changes, you can now say "-padx {10 20}" to put 10 pixels
+	of padding on the left and 20 on the right.  Similar rules apply
+	for vertical padding.  See the revised documentation for details.
 
 2001-01-02  Andreas Kupries  <a.kupries@westend.com>
 
@@ -3426,7 +3433,7 @@
 	here to draw the text.
 	* mac/tkMacProjects.sea.hqx: Rearrange the projects so that the build 
 	directory is separate from the sources.  Much more convenient! 
-        
+
 1999-08-10  Jeff Hobbs  <hobbs@scriptics.com>
 
 	* win/tkWinWm.c: changed "wm deiconify" on Windows to raise and
@@ -3852,9 +3859,9 @@
 1999-03-26    <suresh@scriptics.com>
 	
 	* unix/configure.in:
-        --nameble-shared is now the default and builds Tk as a shared
-        library; specify --disable-shared to build a static Tk library
-        and shell.
+	--nameble-shared is now the default and builds Tk as a shared
+	library; specify --disable-shared to build a static Tk library
+	and shell.
 
 1999-03-26    <surles@scriptics.com>
 
diff --git a/library/demos/image2.tcl b/library/demos/image2.tcl
index 5162ecc..6d3be0f 100644
--- a/library/demos/image2.tcl
+++ b/library/demos/image2.tcl
@@ -3,7 +3,7 @@
 # This demonstration script creates a simple collection of widgets
 # that allow you to select and view images in a Tk label.
 #
-# RCS: @(#) $Id: image2.tcl,v 1.2 1998/09/14 18:23:29 stanton Exp $
+# RCS: @(#) $Id: image2.tcl,v 1.3 2001/08/10 08:33:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
@@ -20,7 +20,7 @@ proc loadDir w {
     global dirName
 
     $w.f.list delete 0 end
-    foreach i [lsort [glob [file join $dirName *]]] {
+    foreach i [lsort [glob -directory $dirName *]] {
 	$w.f.list insert end [file tail $i]
     }
 }