Eliminate "then" keyword

7 files changed, 133 insertions, 125 deletions

diff --git a/ChangeLog b/ChangeLog
index 08007b8..49c74e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-18  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* library/auto.tcl  Eliminate "then" keyword
+	* library/clock.tcl
+	* library/history.tcl
+	* library/safe.tcl
+	* library/tm.tcl
+
 2009-11-17  Andreas Kupries  <andreask@activestate.com>
 
 	* unix/tclUnixChan.c (TtyParseMode): Partial undo of Donal's tidy-
diff --git a/library/auto.tcl b/library/auto.tcl
index 42ffa72..9980b26 100644
--- a/library/auto.tcl
+++ b/library/auto.tcl
@@ -3,7 +3,7 @@
 # utility procs formerly in init.tcl dealing with auto execution of commands
 # and can be auto loaded themselves.
 #
-# RCS: @(#) $Id: auto.tcl,v 1.30 2009/07/26 21:48:45 dkf Exp $
+# RCS: @(#) $Id: auto.tcl,v 1.31 2009/11/18 21:23:21 nijtmans Exp $
 #
 # Copyright (c) 1991-1993 The Regents of the University of California.
 # Copyright (c) 1994-1998 Sun Microsystems, Inc.
@@ -18,7 +18,7 @@
 # the information gets recomputed the next time it's needed.  Also delete any
 # commands that are listed in the auto-load index.
 #
-# Arguments: 
+# Arguments:
 # None.
 
 proc auto_reset {} {
@@ -88,7 +88,7 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
 	    if {
 		$::tcl_platform(platform) eq "unix"
 		&& $::tcl_platform(os) eq "Darwin"
-	    } then {
+	    } {
 		# 4. On MacOSX, check the Resources/Scripts subdir too
 		lappend dirs [file join $d $basename$version Resources Scripts]
 	    }
@@ -180,7 +180,7 @@ if {[interp issafe]} {
 # by any number of glob patterns to use in that directory to locate all of the
 # relevant files.
 #
-# Arguments: 
+# Arguments:
 # dir -		Name of the directory in which to create an index.
 
 # args -	Any number of additional arguments giving the names of files
@@ -334,7 +334,7 @@ namespace eval auto_mkindex_parser {
 # the "proc" command by adding an entry for the index file.  Returns a string
 # that represents the index file.
 #
-# Arguments: 
+# Arguments:
 #	file	Name of Tcl source file to be indexed.
 
 proc auto_mkindex_parser::mkindex {file} {
@@ -449,7 +449,7 @@ proc auto_mkindex_parser::commandInit {name arglist body} {
     if {[string match *::* $name]} {
         set exportCmd [list _%@namespace export [namespace tail $name]]
         $parser eval [list _%@namespace eval $ns $exportCmd]
- 
+
 	# The following proc definition does not work if you want to tolerate
 	# space or something else diabolical in the procedure name, (i.e.,
 	# space in $alias). The following does not work:
@@ -520,7 +520,7 @@ auto_mkindex_parser::command proc {name args} {
     variable scriptFile
     # Do some fancy reformatting on the "source" call to handle platform
     # differences with respect to pathnames.  Use format just so that the
-    # command is a little easier to read (otherwise it'd be full of 
+    # command is a little easier to read (otherwise it'd be full of
     # backslashed dollar signs, etc.
     append index [list set auto_index([fullname $name])] \
 	    [format { [list source [file join $dir %s]]} \
@@ -548,7 +548,7 @@ auto_mkindex_parser::hook {
 
 	# AUTO MKINDEX:  tbcload::bcproc name arglist body
 	# Adds an entry to the auto index list for the given pre-compiled
-	# procedure name.  
+	# procedure name.
 
 	auto_mkindex_parser::commandInit tbcload::bcproc {name args} {
 	    variable index
diff --git a/library/clock.tcl b/library/clock.tcl
index c75a9e2..6d6cc15 100644
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -13,7 +13,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: clock.tcl,v 1.57 2009/10/29 01:17:54 kennykb Exp $
+# RCS: @(#) $Id: clock.tcl,v 1.58 2009/11/18 21:23:20 nijtmans Exp $
 #
 #----------------------------------------------------------------------
 
@@ -44,7 +44,7 @@ namespace eval ::tcl::clock \
 # The 'clock' command manipulates time.  Refer to the user documentation for
 # the available subcommands and what they do.
 #
-#----------------------------------------------------------------------	
+#----------------------------------------------------------------------
 
 namespace eval ::tcl::clock {
 
@@ -190,7 +190,7 @@ proc ::tcl::clock::Initialize {} {
     # Germany, Norway, Denmark (Catholic Germany changed earlier)
 
     ::msgcat::mcset de_DE GREGORIAN_CHANGE_DATE 2342032
-    ::msgcat::mcset nb GREGORIAN_CHANGE_DATE 2342032    
+    ::msgcat::mcset nb GREGORIAN_CHANGE_DATE 2342032
     ::msgcat::mcset nn GREGORIAN_CHANGE_DATE 2342032
     ::msgcat::mcset no GREGORIAN_CHANGE_DATE 2342032
     ::msgcat::mcset da GREGORIAN_CHANGE_DATE 2342032
@@ -226,7 +226,7 @@ proc ::tcl::clock::Initialize {} {
     # Greece
 
     ::msgcat::mcset el GREGORIAN_CHANGE_DATE 2423480
-    
+
     #------------------------------------------------------------------
     #
     #				CONSTANTS
@@ -669,7 +669,7 @@ proc ::tcl::clock::format { args } {
     set clockval [lindex $args 0]
 
     # Get the data for time changes in the given zone
-    
+
     if {$timezone eq ""} {
 	set timezone [GetSystemTimeZone]
     }
@@ -679,11 +679,11 @@ proc ::tcl::clock::format { args } {
 	    return -options $opts $retval
 	}
     }
-    
+
     # Build a procedure to format the result. Cache the built procedure's name
     # in the 'FormatProc' array to avoid losing its internal representation,
     # which contains the name resolution.
-    
+
     set procName formatproc'$format'$locale
     set procName [namespace current]::[string map {: {\:} \\ {\\}} $procName]
     if {[info exists FormatProc($procName)]} {
@@ -692,7 +692,7 @@ proc ::tcl::clock::format { args } {
 	set FormatProc($procName) \
 	    [ParseClockFormatFormat $procName $format $locale]
     }
-    
+
     return [$procName $clockval $timezone]
 }
 
@@ -717,7 +717,7 @@ proc ::tcl::clock::ParseClockFormatFormat {procName format locale} {
     }
 
     # Map away the locale-dependent composite format groups
-    
+
     EnterLocale $locale oldLocale
 
     # Change locale if a fresh locale has been given on the command line.
@@ -751,7 +751,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
     set formatString {}
     set substituents {}
     set state {}
-	
+
     set format [LocalizeFormat $locale $format]
 
     foreach char [split $format {}] {
@@ -778,7 +778,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 				 { [lindex @DAYS_OF_WEEK_ABBREV@ \
 					[expr {[dict get $date dayOfWeek] \
 						   % 7}]]}]
-		    }			 
+		    }
 		    A {			# Day of week, spelt out.
 			append formatString %s
 			append substituents \
@@ -879,7 +879,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 		    k {			# Hour (0-23), no leading zero
 			append formatString %2d
 			append substituents \
-			    { [expr { [dict get $date localSeconds] 
+			    { [expr { [dict get $date localSeconds]
 				      / 3600
 				      % 24 }]}
 		    }
@@ -900,7 +900,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 		    M {			# Minute of the hour, leading zero
 			append formatString %02d
 			append substituents \
-			    { [expr { [dict get $date localSeconds] 
+			    { [expr { [dict get $date localSeconds]
 				      / 60
 				      % 60 }]}
 		    }
@@ -941,7 +941,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 			    { [expr {(([dict get $date localSeconds]
 				       % 86400) < 43200) ?
 				     $am : $pm}]}
-			
+
 		    }
 		    Q {			# Hi, Jeff!
 			append formatString %s
@@ -951,11 +951,11 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 			append formatString %s
 			append substituents { [dict get $date seconds]}
 		    }
-		    S {			# Second of the minute, with 
+		    S {			# Second of the minute, with
 			# leading zero
 			append formatString %02d
 			append substituents \
-			    { [expr { [dict get $date localSeconds] 
+			    { [expr { [dict get $date localSeconds]
 				      % 60 }]}
 		    }
 		    t {			# A literal tab character
@@ -976,7 +976,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 			    }
 			    incr dow
 			    set UweekNumber \
-				[expr { ( [dict get $date dayOfYear] 
+				[expr { ( [dict get $date dayOfYear]
 					  - $dow + 7 )
 					/ 7 }]
 			}
@@ -999,7 +999,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 			    set WweekNumber \
 				[expr { ( [dict get $date dayOfYear]
 					  - [dict get $date dayOfWeek]
-					  + 7 ) 
+					  + 7 )
 					/ 7 }]
 			}
 			append formatString %02d
@@ -1068,7 +1068,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 	    percentO {			# Character following %O
 		set state {}
 		switch -exact -- $char {
-		    d - e {		# Day of the month in alternative 
+		    d - e {		# Day of the month in alternative
 			# numerals
 			append formatString %s
 			append substituents \
@@ -1080,7 +1080,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 			append formatString %s
 			append substituents \
 			    { [lindex $localeNumerals \
-				   [expr { [dict get $date localSeconds] 
+				   [expr { [dict get $date localSeconds]
 					   / 3600
 					   % 24 }]]}
 		    }
@@ -1106,7 +1106,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 			append formatString %s
 			append substituents \
 			    { [lindex $localeNumerals \
-				   [expr { [dict get $date localSeconds] 
+				   [expr { [dict get $date localSeconds]
 					   / 60
 					   % 60 }]]}
 		    }
@@ -1115,7 +1115,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 			append formatString %s
 			append substituents \
 			    { [lindex $localeNumerals \
-				   [expr { [dict get $date localSeconds] 
+				   [expr { [dict get $date localSeconds]
 					   % 60 }]]}
 		    }
 		    u {			# Day of the week (Monday=1,Sunday=7)
@@ -1146,9 +1146,9 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 	    }
 	}
     }
-	
+
     # Clean up any improperly terminated groups
-    
+
     switch -exact -- $state {
 	percent {
 	    append formatString %%
@@ -1244,7 +1244,7 @@ proc ::tcl::clock::scan { args } {
 	    "cannot use -gmt and -timezone in same call"
     }
     if { [catch { expr { wide($base) } } result] } {
-	return -code error "expected integer but got \"$base\"" 
+	return -code error "expected integer but got \"$base\""
     }
     if { ![string is boolean -strict $gmt] } {
 	return -code error "expected boolean value but got \"$gmt\""
@@ -1309,7 +1309,7 @@ proc ::tcl::clock::FreeScan { string base timezone locale } {
     variable TZData
 
     # Get the data for time changes in the given zone
-    
+
     try {
 	SetupTimeZone $timezone
     } on error {retval opts} {
@@ -1368,7 +1368,7 @@ proc ::tcl::clock::FreeScan { string base timezone locale } {
     # Greenwich, and the second is a Daylight Saving Time indicator (1 == yes,
     # 0 == no, -1 == unknown). We make it into a time zone indicator of
     # +-hhmm.
-    
+
     if { [llength $parseZone] > 0 } {
 	lassign $parseZone minEast dstFlag
 	set timezone [FormatNumericTimeZone \
@@ -1382,9 +1382,9 @@ proc ::tcl::clock::FreeScan { string base timezone locale } {
     set date [GetJulianDayFromEraYearMonthDay $date[set date {}] 2361222]
     if { $parseTime ne {} } {
 	dict set date secondOfDay $parseTime
-    } elseif { [llength $parseWeekday] != 0 
-	       || [llength $parseOrdinalMonth] != 0 
-	       || ( [llength $parseRel] != 0 
+    } elseif { [llength $parseWeekday] != 0
+	       || [llength $parseOrdinalMonth] != 0
+	       || ( [llength $parseRel] != 0
 		    && ( [lindex $parseRel 0] != 0
 			 || [lindex $parseRel 1] != 0 ) ) } {
 	dict set date secondOfDay 0
@@ -1406,10 +1406,10 @@ proc ::tcl::clock::FreeScan { string base timezone locale } {
 	set seconds [add $seconds \
 			 $relMonth months $relDay days $relSecond seconds \
 			 -timezone $timezone -locale $locale]
-    }	
+    }
 
     # Do relative weekday
-    
+
     if { [llength $parseWeekday] > 0 } {
 	lassign $parseWeekday dayOrdinal dayOfWeek
 	set date2 [GetDateFields $seconds $TZData($timezone) 2361222]
@@ -1737,7 +1737,7 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} {
 			append re \\s*\\d\\d?
 		    }
 		    V {			# Week of ISO8601 year
-			
+
 			append re \\s*(\\d\\d?)
 			dict set fieldSet iso8601Week [incr fieldCount]
 			append postcode "dict set date iso8601Week \[" \
@@ -1909,7 +1909,7 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} {
 					"day of week is greater than 7"
 				}
 				dict set date dayOfWeek $dow
-			    }				
+			    }
 		    }
 		    y {
 			lassign [LocaleNumeralMatcher $locale] regex lookup
@@ -1958,7 +1958,7 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} {
     # Set up the time zone before doing anything with a default base date
     # that might need a timezone to interpret it.
 
-    if { ![dict exists $fieldSet seconds] 
+    if { ![dict exists $fieldSet seconds]
 	    && ![dict exists $fieldSet starDate] } {
 	if { [dict exists $fieldSet tzName] } {
 	    append procBody {
@@ -1982,7 +1982,7 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} {
     # Convert to local time unless epoch seconds or stardate are
     # being processed - they're always absolute
 
-    if { ![dict exists $fieldSet seconds] 
+    if { ![dict exists $fieldSet seconds]
          && ![dict exists $fieldSet starDate] } {
 	append procBody {
 	    if { [dict get $date julianDay] > 5373484 } {
@@ -2014,7 +2014,7 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} {
 
     return $procName
 }
-	
+
 #----------------------------------------------------------------------
 #
 # LocaleNumeralMatcher --
@@ -2052,7 +2052,7 @@ proc ::tcl::clock::LocaleNumeralMatcher {l} {
     }
     return [dict get $LocaleNumeralCache $l]
 }
-	
+
 
 
 #----------------------------------------------------------------------
@@ -2091,7 +2091,7 @@ proc ::tcl::clock::UniquePrefixRegexp { data } {
     # Walk the key-value pairs
 
     foreach { key value } $data {
-	# Construct all prefixes of the key; 
+	# Construct all prefixes of the key;
 
 	set prefix {}
 	foreach char [split $key {}] {
@@ -2154,7 +2154,7 @@ proc ::tcl::clock::UniquePrefixRegexp { data } {
 #
 #----------------------------------------------------------------------
 
-proc ::tcl::clock::MakeUniquePrefixRegexp { successors 
+proc ::tcl::clock::MakeUniquePrefixRegexp { successors
 					  uniquePrefixMapping
 					  prefixString } {
     # Get the characters that may follow the current prefix string
@@ -2172,7 +2172,7 @@ proc ::tcl::clock::MakeUniquePrefixRegexp { successors
     if {
 	[dict exists $uniquePrefixMapping $prefixString]
 	|| [llength $schars] > 1
-    } then {
+    } {
 	append re "(?:"
     }
 
@@ -2268,7 +2268,7 @@ proc ::tcl::clock::MakeParseCodeFromFields { dateFields parseActions } {
 		    ![string is integer $newPos]
 		    || ![string is integer $currPos]
 		    || $newPos > $currPos
-		} then {
+		} {
 		    break
 		}
 		if { $newPos < $currPos } {
@@ -2358,7 +2358,7 @@ proc ::tcl::clock::EnterLocale { locale oldLocaleVar } {
 	mcload $MsgDir
 	dict set McLoaded $locale {}
     }
-}    
+}
 
 #----------------------------------------------------------------------
 #
@@ -2518,7 +2518,7 @@ proc ::tcl::clock::LocalizeFormat { locale format } {
     # string.  Note that the order of the [string map] operations is
     # significant because later formats can refer to later ones; for example
     # %c can refer to %X, which in turn can refer to %T.
-    
+
     set list {
 	%% %%
 	%D %m/%d/%Y
@@ -2535,7 +2535,7 @@ proc ::tcl::clock::LocalizeFormat { locale format } {
     lappend list %c  [string map $list [mc DATE_TIME_FORMAT]]
     lappend list %Ec [string map $list [mc LOCALE_DATE_TIME_FORMAT]]
     set format [string map $list $format]
-				       
+
     dict set McLoaded $locale FORMAT $inFormat $format
     return $format
 }
@@ -2740,7 +2740,7 @@ proc ::tcl::clock::ScanWide { str } {
 #
 #----------------------------------------------------------------------
 
-proc ::tcl::clock::InterpretTwoDigitYear { date baseTime 
+proc ::tcl::clock::InterpretTwoDigitYear { date baseTime
 					   { twoDigitField yearOfCentury }
 					   { fourDigitField year } } {
     set yr [dict get $date $twoDigitField]
@@ -2831,7 +2831,7 @@ proc ::tcl::clock::AssignBaseIso8601Year {date baseTime timeZone changeover} {
 #
 # AssignBaseMonth --
 #
-#	Places the number of the current year and month into a 
+#	Places the number of the current year and month into a
 #	dictionary.
 #
 # Parameters:
@@ -3096,7 +3096,7 @@ proc ::tcl::clock::SetupTimeZone { timezone } {
 	} elseif {
 	    [regexp {^([-+])(\d\d)(?::?(\d\d)(?::?(\d\d))?)?} $timezone \
 		    -> s hh mm ss]
-	} then {
+	} {
 	    # Make a fixed offset
 
 	    ::scan $hh %d hh
@@ -3119,7 +3119,7 @@ proc ::tcl::clock::SetupTimeZone { timezone } {
 	} elseif { [string index $timezone 0] eq {:} } {
 	    # Convert using a time zone file
 
-	    if { 
+	    if {
 		[catch {
 		    LoadTimeZoneFile [string range $timezone 1 end]
 		}] && [catch {
@@ -3130,7 +3130,7 @@ proc ::tcl::clock::SetupTimeZone { timezone } {
 		    -errorcode [list CLOCK badTimeZone $timezone] \
 		    "time zone \"$timezone\" not found"
 	    }
-	    
+
 	} elseif { ![catch {ParsePosixTimeZone $timezone} tzfields] } {
 	    # This looks like a POSIX time zone - try to process it
 
@@ -3295,7 +3295,7 @@ proc ::tcl::clock::GuessWindowsTimeZone {} {
 		: [::format %02d $stdSecond]
 	}
 	dict set WinZoneInfo $data $tzname
-    } 
+    }
 
     return [dict get $WinZoneInfo $data]
 }
@@ -3448,10 +3448,10 @@ proc ::tcl::clock::ReadZoneinfoFile {fileName fname} {
     if {$version eq "2"} {
 	set seek [expr {
 	    44
-	    + 5 * $nTime 
-	    + 6 * $nType 
+	    + 5 * $nTime
+	    + 6 * $nType
 	    + 4 * $nLeap
-	    + $nIsStd 
+	    + $nIsStd
 	    + $nIsGMT
 	    + $nChar
 	}]
@@ -3565,7 +3565,7 @@ proc ::tcl::clock::ReadZoneinfoFile {fileName fname} {
 # The following keys are present in the dictionary:
 #	stdName - Name of the time zone when Daylight Saving Time
 #		  is not in effect.
-#	stdSignum - Sign (+, -, or empty) of the offset from Greenwich 
+#	stdSignum - Sign (+, -, or empty) of the offset from Greenwich
 #		    to the given (non-DST) time zone.  + and the empty
 #		    string denote zones west of Greenwich, - denotes east
 #		    of Greenwich; this is contrary to the ISO convention
@@ -3610,7 +3610,7 @@ proc ::tcl::clock::ReadZoneinfoFile {fileName fname} {
 #	endHours, endMinutes, endSeconds -
 #		Specify the end of DST in the same way that the start* fields
 #		specify the beginning of DST.
-#		
+#
 # This procedure serves only to break the time specifier into fields.  No
 # attempt is made to canonicalize the fields or supply default values.
 #
@@ -3627,8 +3627,8 @@ proc ::tcl::clock::ParsePosixTimeZone { tz } {
 	([[:digit:]]{1,2})
 	(?:
 	    # 4 - Standard time zone offset, minutes
-	    : ([[:digit:]]{1,2}) 
-	    (?: 
+	    : ([[:digit:]]{1,2})
+	    (?:
 	        # 5 - Standard time zone offset, seconds
 		: ([[:digit:]]{1,2} )
 	    )?
@@ -3644,8 +3644,8 @@ proc ::tcl::clock::ParsePosixTimeZone { tz } {
 		    ([[:digit:]]{1,2})
 		    (?:
 			# 9 - DST time zone offset, minutes
-			: ([[:digit:]]{1,2}) 
-			(?: 
+			: ([[:digit:]]{1,2})
+			(?:
 		            # 10 - DST time zone offset, seconds
 			    : ([[:digit:]]{1,2})
 			)?
@@ -3658,8 +3658,8 @@ proc ::tcl::clock::ParsePosixTimeZone { tz } {
 		        ( J ? )	( [[:digit:]]+ )
                         | M
 			# 13 - Month number 14 - Week of month 15 - Day of week
-			( [[:digit:]] + ) 
-			[.] ( [[:digit:]] + ) 
+			( [[:digit:]] + )
+			[.] ( [[:digit:]] + )
 			[.] ( [[:digit:]] + )
 		    )
 		    (?:
@@ -3680,8 +3680,8 @@ proc ::tcl::clock::ParsePosixTimeZone { tz } {
 		        ( J ? )	( [[:digit:]]+ )
                         | M
 			# 21 - Month number 22 - Week of month 23 - Day of week
-			( [[:digit:]] + ) 
-			[.] ( [[:digit:]] + ) 
+			( [[:digit:]] + )
+			[.] ( [[:digit:]] + )
 			[.] ( [[:digit:]] + )
 		    )
 		    (?:
@@ -3750,14 +3750,14 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } {
     } else {
 	set stdSignum -1
     }
-    set stdHours [lindex [::scan [dict get $z stdHours] %d] 0] 
+    set stdHours [lindex [::scan [dict get $z stdHours] %d] 0]
     if { [dict get $z stdMinutes] ne {} } {
-	set stdMinutes [lindex [::scan [dict get $z stdMinutes] %d] 0] 
+	set stdMinutes [lindex [::scan [dict get $z stdMinutes] %d] 0]
     } else {
 	set stdMinutes 0
     }
     if { [dict get $z stdSeconds] ne {} } {
-	set stdSeconds [lindex [::scan [dict get $z stdSeconds] %d] 0] 
+	set stdSeconds [lindex [::scan [dict get $z stdSeconds] %d] 0]
     } else {
 	set stdSeconds 0
     }
@@ -3786,14 +3786,14 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } {
     if { [dict get $z dstHours] eq {} } {
 	set dstOffset [expr { 3600 + $stdOffset }]
     } else {
-	set dstHours [lindex [::scan [dict get $z dstHours] %d] 0] 
+	set dstHours [lindex [::scan [dict get $z dstHours] %d] 0]
 	if { [dict get $z dstMinutes] ne {} } {
-	    set dstMinutes [lindex [::scan [dict get $z dstMinutes] %d] 0] 
+	    set dstMinutes [lindex [::scan [dict get $z dstMinutes] %d] 0]
 	} else {
 	    set dstMinutes 0
 	}
 	if { [dict get $z dstSeconds] ne {} } {
-	    set dstSeconds [lindex [::scan [dict get $z dstSeconds] %d] 0] 
+	    set dstSeconds [lindex [::scan [dict get $z dstSeconds] %d] 0]
 	} else {
 	    set dstSeconds 0
 	}
@@ -3810,7 +3810,7 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } {
 
     if {
 	[dict get $z startDayOfYear] eq {} && [dict get $z startMonth] eq {}
-    } then {
+    } {
 	if {($stdSignum * $stdHours>=0) && ($stdSignum * $stdHours<=12)} {
 	    # EU
 	    dict set z startWeekOfMonth 5
@@ -3831,7 +3831,7 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } {
     }
     if {
 	[dict get $z endDayOfYear] eq {} && [dict get $z endMonth] eq {}
-    } then {
+    } {
 	if {($stdSignum * $stdHours>=0) && ($stdSignum * $stdHours<=12)} {
 	    # EU
 	    dict set z endMonth 10
@@ -3871,7 +3871,7 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } {
     }
 
     return $data
-}    
+}
 
 #----------------------------------------------------------------------
 #
@@ -3904,7 +3904,7 @@ proc ::tcl::clock::DeterminePosixDSTTime { z bound y } {
 	# Time was specified as a day of the year
 
 	if { [dict get $z ${bound}J] ne {}
-	     && [IsGregorianLeapYear $y] 
+	     && [IsGregorianLeapYear $y]
 	     && ( $doy > $FEB_28 ) } {
 	    incr doy
 	}
@@ -4039,7 +4039,7 @@ proc ::tcl::clock::GetJulianDayFromEraYearDay {date changeover} {
 	- ( $ym1 / 100 )
 	+ ( $ym1 / 400 )
     }]
-    
+
     # If the date is before the Gregorian change, use the Julian calendar.
 
     if { $jd < $changeover } {
@@ -4121,7 +4121,7 @@ proc ::tcl::clock::GetJulianDayFromEraYearMonthWeekDay {date changeover} {
 
 proc ::tcl::clock::IsGregorianLeapYear { date } {
     switch -exact -- [dict get $date era] {
-	BCE { 
+	BCE {
 	    set year [expr { 1 - [dict get $date year]}]
 	}
 	CE {
@@ -4304,7 +4304,7 @@ proc ::tcl::clock::add { clockval args } {
 	    "cannot use -gmt and -timezone in same call"
     }
     if { [catch { expr { wide($clockval) } } result] } {
-	return -code error "expected integer but got \"$clockval\"" 
+	return -code error "expected integer but got \"$clockval\""
     }
     if { ![string is boolean -strict $gmt] } {
 	return -code error "expected boolean value but got \"$gmt\""
@@ -4313,7 +4313,7 @@ proc ::tcl::clock::add { clockval args } {
     }
 
     EnterLocale $locale oldLocale
-    
+
     set changeover [mc GREGORIAN_CHANGE_DATE]
 
     if {[catch {SetupTimeZone $timezone} retval opts]} {
diff --git a/library/history.tcl b/library/history.tcl
index 077d604..4d21143 100644
--- a/library/history.tcl
+++ b/library/history.tcl
@@ -2,7 +2,7 @@
 #
 # Implementation of the history command.
 #
-# RCS: @(#) $Id: history.tcl,v 1.8 2009/07/25 21:51:02 dkf Exp $
+# RCS: @(#) $Id: history.tcl,v 1.9 2009/11/18 21:23:20 nijtmans Exp $
 #
 # Copyright (c) 1997 Sun Microsystems, Inc.
 #
@@ -78,7 +78,7 @@ proc ::tcl::HistAdd {event {exec {}}} {
     if {
 	[prefix longest {exec {}} $exec] eq ""
 	&& [llength [info level 0]] == 3
-    } then {
+    } {
 	return -code error "bad argument \"$exec\": should be \"exec\""
     }
 
diff --git a/library/package.tcl b/library/package.tcl
index d8729b2..839f506 100644
--- a/library/package.tcl
+++ b/library/package.tcl
@@ -3,7 +3,7 @@
 # utility procs formerly in init.tcl which can be loaded on demand
 # for package management.
 #
-# RCS: @(#) $Id: package.tcl,v 1.37 2009/07/26 11:40:23 dkf Exp $
+# RCS: @(#) $Id: package.tcl,v 1.38 2009/11/18 21:23:20 nijtmans Exp $
 #
 # Copyright (c) 1991-1993 The Regents of the University of California.
 # Copyright (c) 1994-1998 Sun Microsystems, Inc.
@@ -42,7 +42,7 @@ proc tcl::Pkg::CompareExtension { fileName {ext {}} } {
             set currExt [file extension $root]
             if {$currExt eq $ext} {
                 return 1
-            } 
+            }
 
 	    # The current extension does not match; if it is not a numeric
 	    # value, quit, as we are only looking to ignore version number
@@ -304,14 +304,14 @@ proc pkg_mkIndex {args} {
 		if { !$::tcl::direct } {
 		    # See what new namespaces appeared, and import commands
 		    # from them.  Only exported commands go into the index.
-		    
+
 		    foreach ::tcl::x [::tcl::GetAllNamespaces] {
 			if {! [info exists ::tcl::namespaces($::tcl::x)]} {
 			    namespace import -force ${::tcl::x}::*
 			}
 
 			# Figure out what commands appeared
-			
+
 			foreach ::tcl::x [info commands] {
 			    set ::tcl::newCmds($::tcl::x) 1
 			}
@@ -320,19 +320,19 @@ proc pkg_mkIndex {args} {
 			}
 			foreach ::tcl::x [array names ::tcl::newCmds] {
 			    # determine which namespace a command comes from
-			    
+
 			    set ::tcl::abs [namespace origin $::tcl::x]
-			    
+
 			    # special case so that global names have no
 			    # leading ::, this is required by the unknown
 			    # command
-			    
+
 			    set ::tcl::abs \
 				    [lindex [auto_qualify $::tcl::abs ::] 0]
-			    
+
 			    if {$::tcl::x ne $::tcl::abs} {
 				# Name changed during qualification
-				
+
 				set ::tcl::newCmds($::tcl::abs) 1
 				unset ::tcl::newCmds($::tcl::x)
 			    }
@@ -446,7 +446,7 @@ proc tclPkgSetup {dir pkg version files} {
 		set auto_index($cmd) [list load [file join $dir $f] $pkg]
 	    } else {
 		set auto_index($cmd) [list source [file join $dir $f]]
-	    } 
+	    }
 	}
     }
 }
@@ -475,7 +475,7 @@ proc tclPkgUnknown {name args} {
     set old_path [set use_path $auto_path]
     while {[llength $use_path]} {
 	set dir [lindex $use_path end]
-	
+
 	# Make sure we only scan each directory one time.
 	if {[info exists tclSeenPath($dir)]} {
 	    set use_path [lrange $use_path 0 end-1]
@@ -507,7 +507,7 @@ proc tclPkgUnknown {name args} {
 	set dir [lindex $use_path end]
 	if {![info exists procdDirs($dir)]} {
 	    set file [file join $dir pkgIndex.tcl]
-	    # safe interps usually don't have "file exists", 
+	    # safe interps usually don't have "file exists",
 	    if {([interp issafe] || [file exists $file])} {
 		try {
 		    source $file
@@ -546,7 +546,7 @@ proc tclPkgUnknown {name args} {
 	# Don't add directories we've already seen, or ones already on the
 	# $use_path.
 	foreach dir [lrange $auto_path $index end] {
-	    if {![info exists tclSeenPath($dir)] 
+	    if {![info exists tclSeenPath($dir)]
 		    && ([lsearch -exact $use_path $dir] == -1) } {
 		lappend use_path $dir
 	    }
@@ -630,7 +630,7 @@ proc tcl::MacOSXPkgUnknown {original name args} {
 	# Don't add directories we've already seen, or ones already on the
 	# $use_path.
 	foreach dir [lrange $auto_path $index end] {
-	    if {![info exists tclSeenPath($dir)] 
+	    if {![info exists tclSeenPath($dir)]
 		    && ([lsearch -exact $use_path $dir] == -1) } {
 		lappend use_path $dir
 	    }
@@ -681,7 +681,7 @@ proc ::tcl::Pkg::Create {args} {
     if { $len < 6 } {
 	error $err(wrongNumArgs)
     }
-    
+
     # Initialize parameters
     set opts(-name)		{}
     set opts(-version)		{}
@@ -720,14 +720,14 @@ proc ::tcl::Pkg::Create {args} {
     if { [llength $opts(-version)] == 0 } {
 	error [format $err(valueMissing) "-version"]
     }
-    
+
     if { [llength $opts(-source)] == 0 && [llength $opts(-load)] == 0 } {
 	error $err(noLoadOrSource)
     }
 
     # OK, now everything is good.  Generate the package ifneeded statment.
     set cmdline "package ifneeded $opts(-name) $opts(-version) "
-    
+
     set cmdList {}
     set lazyFileList {}
 
@@ -740,7 +740,7 @@ proc ::tcl::Pkg::Create {args} {
 	    foreach {filename proclist} $filespec {
 		break
 	    }
-	    
+
 	    if { [llength $proclist] == 0 } {
 		set cmd "\[list $key \[file join \$dir [list $filename]\]\]"
 		lappend cmdList $cmd
@@ -758,4 +758,4 @@ proc ::tcl::Pkg::Create {args} {
     return $cmdline
 }
 
-interp alias {} ::pkg::create {} ::tcl::Pkg::Create 
+interp alias {} ::pkg::create {} ::tcl::Pkg::Create
diff --git a/library/safe.tcl b/library/safe.tcl
index 5ea12b1..561659b 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -4,7 +4,7 @@
 # It implements a virtual path mecanism to hide the real pathnames from the
 # slave. It runs in a master interpreter and sets up data structure and
 # aliases that will be invoked when used from a slave interpreter.
-# 
+#
 # See the safe.n man page for details.
 #
 # Copyright (c) 1996-1997 Sun Microsystems, Inc.
@@ -12,7 +12,7 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: safe.tcl,v 1.31 2009/11/06 18:16:58 andreas_kupries Exp $
+# RCS: @(#) $Id: safe.tcl,v 1.32 2009/11/18 21:23:21 nijtmans Exp $
 
 #
 # The implementation is based on namespaces. These naming conventions are
@@ -38,7 +38,7 @@ proc ::safe::InterpStatics {} {
 	upvar $v $v
     }
     set flag [::tcl::OptProcArgGiven -noStatics]
-    if {$flag && (!$noStatics == !$statics) 
+    if {$flag && (!$noStatics == !$statics)
 	&& ([::tcl::OptProcArgGiven -statics])} {
 	return -code error\
 	    "conflicting values given for -statics and -noStatics"
@@ -59,7 +59,7 @@ proc ::safe::InterpNested {} {
     set flag [::tcl::OptProcArgGiven -nestedLoadOk]
     # note that the test here is the opposite of the "InterpStatics" one
     # (it is not -noNested... because of the wanted default value)
-    if {$flag && (!$nestedLoadOk != !$nested) 
+    if {$flag && (!$nestedLoadOk != !$nested)
 	&& ([::tcl::OptProcArgGiven -nested])} {
 	return -code error\
 	    "conflicting values given for -nested and -nestedLoadOk"
@@ -194,7 +194,7 @@ proc ::safe::interpConfigure {args} {
 	    if {
 		![::tcl::OptProcArgGiven -statics]
 		&& ![::tcl::OptProcArgGiven -noStatics]
-	    } then {
+	    } {
 		set statics    $state(staticsok)
 	    } else {
 		set statics    [InterpStatics]
@@ -202,7 +202,7 @@ proc ::safe::interpConfigure {args} {
 	    if {
 		[::tcl::OptProcArgGiven -nested] ||
 		[::tcl::OptProcArgGiven -nestedLoadOk]
-	    } then {
+	    } {
 		set nested     [InterpNested]
 	    } else {
 		set nested     $state(nestedok)
@@ -240,7 +240,7 @@ proc ::safe::interpConfigure {args} {
 #
 # Returns the slave name.
 #
-# Optional Arguments : 
+# Optional Arguments :
 # + slave name : if empty, generated name will be used
 # + access_path: path list controlling where load/source can occur,
 #                if empty: the master auto_path will be used.
@@ -251,7 +251,7 @@ proc ::safe::interpConfigure {args} {
 
 # use the full name and no indent so auto_mkIndex can find us
 proc ::safe::InterpCreate {
-			   slave 
+			   slave
 			   access_path
 			   staticsok
 			   nestedok
@@ -426,7 +426,7 @@ proc ::safe::interpAddToAccessPath {slave path} {
 # interpreter. It is useful when you want to install the safe base aliases
 # into a preexisting safe interpreter.
 proc ::safe::InterpInit {
-			 slave 
+			 slave
 			 access_path
 			 staticsok
 			 nestedok
@@ -469,14 +469,14 @@ proc ::safe::InterpInit {
 
     if {[catch {::interp eval $slave {
 	source [file join $tcl_library init.tcl]
-    }} msg]} then {
+    }} msg]} {
 	Log $slave "can't source init.tcl ($msg)"
 	return -code error "can't source init.tcl into slave $slave ($msg)"
     }
 
     if {[catch {::interp eval $slave {
 	source [file join $tcl_library tm.tcl]
-    }} msg]} then {
+    }} msg]} {
 	Log $slave "can't source tm.tcl ($msg)"
 	return -code error "can't source tm.tcl into slave $slave ($msg)"
     }
@@ -556,7 +556,7 @@ proc ::safe::interpDelete {slave} {
     return
 }
 
-# Set (or get) the logging mecanism 
+# Set (or get) the logging mecanism
 
 proc ::safe::setLogCmd {args} {
     variable Log
@@ -751,7 +751,7 @@ proc ::safe::AliasSource {slave args} {
 	return -code error $msg
     }
     set file [lindex $args $at]
-    
+
     # get the real path from the virtual one.
     try {
 	set file [TranslatePath $slave $file]
@@ -759,7 +759,7 @@ proc ::safe::AliasSource {slave args} {
 	Log $slave $msg
 	return -code error "permission denied"
     }
-    
+
     # check that the path is in the access path of that slave
     try {
 	FileInAccessPath $slave $file
@@ -780,7 +780,7 @@ proc ::safe::AliasSource {slave args} {
     if {[catch {
 	# We use catch here because we want to catch non-error/ok too
 	::interp invokehidden $slave source {*}$encoding $file
-    } msg]} then {
+    } msg]} {
 	Log $slave $msg
 	return -code error "script error"
     }
diff --git a/library/tm.tcl b/library/tm.tcl
index ca0bbf7..90f8296 100644
--- a/library/tm.tcl
+++ b/library/tm.tcl
@@ -181,7 +181,7 @@ proc ::tcl::tm::list {} {
 
 proc ::tcl::tm::UnknownHandler {original name args} {
     # Import the list of paths to search for packages in module form.
-    # Import the pattern used to check package names in detail.  
+    # Import the pattern used to check package names in detail.
 
     variable paths
     variable pkgpattern
@@ -263,7 +263,7 @@ proc ::tcl::tm::UnknownHandler {original name args} {
 		    if {
 			($pkgname eq $name) &&
 			[package vsatisfies $pkgversion {*}$args]
-		    } then {
+		    } {
 			set satisfied 1
 
 			# We do not abort the loop, and keep adding provide
@@ -357,7 +357,7 @@ proc ::tcl::tm::roots {paths} {
 	}
 	set px [file join $p site-tcl]
 	if {![interp issafe]} { set px [file normalize $px] }
-	path add $px 
+	path add $px
     }
     return
 }