diff --git a/doc/xschem_man/install_xschem.html b/doc/xschem_man/install_xschem.html
index fdcbde05..f4dadfaf 100644
--- a/doc/xschem_man/install_xschem.html
+++ b/doc/xschem_man/install_xschem.html
@@ -93,7 +93,7 @@ p{padding: 15px 30px 10px;}
installation, for example in /usr/local):
- user:~$ make install
+ user:~$ sudo make install
This will install all the runtime needed files into the locations previously configured
@@ -111,7 +111,7 @@ p{padding: 15px 30px 10px;}
xschem-<version>/src/ without installation.
- user:~$ cd xschem-2.7.0/src && ./xschem
+ user:~$ cd xschem-2.7.0/src && ./xschem
When xschem is running, type puts $XSCHEM_LIBRARY_PATH in the xschem tcl prompt to
diff --git a/src/editprop.c b/src/editprop.c
index 6c355dce..a587c5e8 100644
--- a/src/editprop.c
+++ b/src/editprop.c
@@ -1222,7 +1222,7 @@ static int edit_text_property(int x)
modified = 1;
xctx->push_undo();
}
- set_modify(-2); /* clear text floater caches */
+ /* set_modify(-2); */ /* ? Not needed, overkill... clear text floater caches */
for(k=0;klastsel; ++k)
{
if(xctx->sel_array[k].type!=xTEXT) continue;
@@ -1273,7 +1273,7 @@ static int edit_text_property(int x)
}
my_strdup2(_ALLOC_ID_, &xctx->text[sel].txt_ptr, (char *) tclgetvar("retval"));
}
- if(x==0 && props_changed) {
+ if(props_changed) {
if(oldprop && preserve)
set_different_token(&xctx->text[sel].prop_ptr, (char *) tclgetvar("props"), oldprop);
else
@@ -1282,6 +1282,9 @@ static int edit_text_property(int x)
my_free(_ALLOC_ID_, &xctx->text[sel].floater_ptr);
set_text_flags(&xctx->text[sel]);
}
+ if(text_changed || props_changed) {
+ get_text_floater(sel);
+ }
if(size_changed) {
xctx->text[sel].xscale=hsize;
xctx->text[sel].yscale=vsize;
diff --git a/src/hilight.c b/src/hilight.c
index 6c53ad3f..144ac5d7 100644
--- a/src/hilight.c
+++ b/src/hilight.c
@@ -624,7 +624,7 @@ static int bus_search(const char*s)
}
#ifndef __unix__
-static int win_regexec(const char *options, const char *pattern, char *name)
+static int win_regexec(const char *options, const char *pattern, const char *name)
{
if (options!=NULL)
tclvareval("regexp {", options,"} {", pattern, "} {", name, "}", NULL);
diff --git a/src/scheduler.c b/src/scheduler.c
index 5275c73e..a6494b73 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -69,7 +69,7 @@ static int get_symbol(const char *s)
int get_instance(const char *s)
{
- int i, found=0;
+ int i = -1, found=0;
Int_hashentry *entry;
if(isonlydigit(s)) {
@@ -78,8 +78,10 @@ int get_instance(const char *s)
}
else if(xctx->floater_inst_table.table) {
entry = int_hash_lookup(&xctx->floater_inst_table, s, 0, XLOOKUP);
- i = entry ? entry->value : -1;
- found = 1;
+ if(entry) {
+ i = entry->value;
+ found = 1;
+ }
} else {
for(i=0;iinstances; ++i) {
if(!strcmp(xctx->inst[i].instname, s)) {
diff --git a/src/xschem.tcl b/src/xschem.tcl
index 2253e307..bf0b2502 100644
--- a/src/xschem.tcl
+++ b/src/xschem.tcl
@@ -6416,6 +6416,7 @@ global env has_x OS autofocus_mainwindow
bind $topwin {xschem callback %W %T %x %y 0 %b 0 [expr {$Mod1Mask}]}
bind $topwin {xschem callback %W %T %x %y 0 %b 0 [expr {$ControlMask + $Mod1Mask}]}
bind $topwin {xschem callback %W %T %x %y 0 %b 0 [expr {$ShiftMask + $Mod1Mask}]}
+ bind $topwin {xschem callback %W %T %x %y 0 0 0 [expr {$Mod1Mask+%s}]}
bind $topwin {xschem callback %W %T %x %y %N 0 0 [expr {$Mod1Mask}]}
bind $topwin {xschem callback %W %T %x %y %N 0 0 [expr {$ControlMask + $Mod1Mask}]}
bind $topwin {xschem callback %W %T %x %y %N 0 0 [expr {$ShiftMask + $Mod1Mask}]}
diff --git a/tests/run_regression.tcl b/tests/run_regression.tcl
index 17dc56ec..ecf3ada7 100644
--- a/tests/run_regression.tcl
+++ b/tests/run_regression.tcl
@@ -4,7 +4,7 @@
# This file is part of XSCHEM,
# a schematic capture and Spice/Vhdl/Verilog netlisting tool for circuit
# simulation.
-# Copyright (C) 1998-2022 Stefan Frederik Schippers
+# Copyright (C) 1998-2023 Stefan Frederik Schippers
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -57,4 +57,4 @@ foreach tc $tcases {
}
source test_utility.tcl
-exec $xschem_cmd --pipe -q --script xschemtest.tcl > stefan_xschemtest.log 2>@1
+exec $xschem_cmd --pipe -q --script xschemtest.tcl 2>&1 > stefan_xschemtest.log
\ No newline at end of file