No comments

diff --git a/src/WOKTclLib/WOKVC.SCCS b/src/WOKTclLib/WOKVC.SCCS
index dec40e072f2f703f8e45584c450ad076f8e135ca..0edd68b902f78cf180c6b4ac75d90d7708e0e7a6 100755 (executable)
--- a/src/WOKTclLib/WOKVC.SCCS
+++ b/src/WOKTclLib/WOKVC.SCCS
@@ -217,7 +217,7 @@ proc wokIntegre:BASE:Execute { VERBOSE command {fileid stdout} } {
 ;# retourne une string  contenant le diff de Sfile dans les versions v1 et v2
 ;#;<
 proc wokIntegre:BASE:diff { sfile v1 v2 } {
-    return [exec sccsdiff -p $sfile -r$v1 -r$v2]
+    return [exec sccsdiff -p -b $sfile -r$v1 -r$v2]
 }
 ;#;>
 ;# retourne une string  contenant le contenu de la version v de sfile. 

diff --git a/src/WOKTclLib/WOKVC.tcl b/src/WOKTclLib/WOKVC.tcl
index d27f2535dc9184d743035839de41e06880dec3e2..922dcd0a57da812f2f89059f49d5ff2ae29733c7 100755 (executable)
--- a/src/WOKTclLib/WOKVC.tcl
+++ b/src/WOKTclLib/WOKVC.tcl
@@ -142,6 +142,7 @@ proc wokIntegrebase  { } {
             ;#
             ;# Lecture du report
             ;#  
+           catch { unset table info notes }
             set stat [wokStore:Report:Process normal $REPORT table info notes]
             if { $stat == -1 } {
                 wokIntegreCleanup $broot table [list $jnlid] $dirtmp 

diff --git a/src/WOKTclLib/Wok_Init.tcl b/src/WOKTclLib/Wok_Init.tcl
index 237bce30631708cb5e58fc545bf9ddc862787c0a..f6406bc25a296660d9a2219ad941d1e651695931 100755 (executable)
--- a/src/WOKTclLib/Wok_Init.tcl
+++ b/src/WOKTclLib/Wok_Init.tcl
@@ -1,3 +1,14 @@
+set __initenv__ [array get env]
+
+proc __restore_env__ {} {
+  global env __initenv__
+  set m [array size env]
+  for {set i 0} {$i < $m} {incr i} {
+    set k [array startsearch env]
+    unset env([array nextelement env $k])
+  }
+  array set env $__initenv__
+}
 
 auto_load wok_cd_proc
 auto_load wok_exit_proc
@@ -16,7 +27,7 @@ global WOK_GLOBALS;
 
 set WOK_GLOBALS(setenv_proc,term)  1
 set WOK_GLOBALS(setenv_proc,emacs) 1
-set WOK_GLOBALS(setenv_proc,tcl)   0
+set WOK_GLOBALS(setenv_proc,tcl)   1
 
 set WOK_GLOBALS(cd_proc,term)      1
 set WOK_GLOBALS(cd_proc,emacs)     1

diff --git a/src/WOKTclLib/wokCreations.tcl b/src/WOKTclLib/wokCreations.tcl
index 4eb405fc4c78cd7d93a0559d93a4c4be4b380639..5b04ae77ef954d415914a9464d79b5f6c786cb33 100755 (executable)
--- a/src/WOKTclLib/wokCreations.tcl
+++ b/src/WOKTclLib/wokCreations.tcl
@@ -134,6 +134,9 @@ proc wokWbtree:Tree { tree hli ent name ima } {
            }
        }
     }
+    if { [info procs ${name}.wokhasq] == "${name}.wokhasq" } {
+       $hli entryconfigure ${ent}^${name} -image [${name}.wokhasq]
+    }
     return
 }