Fossil SCM
Fix an autosetup bug which prevented libreadline from being detected when running autosetup under tclsh
Commit
7eeb5c64cccc48159868ec6df34ce59c7ad7b33a
Parent
0fd14820f728a6f…
1 file changed
+1
-7
+1
-7
| --- autosetup/cc.tcl | ||
| +++ autosetup/cc.tcl | ||
| @@ -331,17 +331,11 @@ | ||
| 331 | 331 | # simply replaces the existing value. |
| 332 | 332 | # |
| 333 | 333 | # Returns the previous settings |
| 334 | 334 | proc cc-update-settings {args} { |
| 335 | 335 | set prev [cc-get-settings] |
| 336 | - array set new $prev | |
| 337 | - | |
| 338 | - foreach {name value} $args { | |
| 339 | - set new($name) $value | |
| 340 | - } | |
| 341 | - cc-store-settings $new | |
| 342 | - | |
| 336 | + cc-store-settings [dict merge $prev $args] | |
| 343 | 337 | return $prev |
| 344 | 338 | } |
| 345 | 339 | |
| 346 | 340 | # @cc-with settings ?{ script }? |
| 347 | 341 | # |
| 348 | 342 |
| --- autosetup/cc.tcl | |
| +++ autosetup/cc.tcl | |
| @@ -331,17 +331,11 @@ | |
| 331 | # simply replaces the existing value. |
| 332 | # |
| 333 | # Returns the previous settings |
| 334 | proc cc-update-settings {args} { |
| 335 | set prev [cc-get-settings] |
| 336 | array set new $prev |
| 337 | |
| 338 | foreach {name value} $args { |
| 339 | set new($name) $value |
| 340 | } |
| 341 | cc-store-settings $new |
| 342 | |
| 343 | return $prev |
| 344 | } |
| 345 | |
| 346 | # @cc-with settings ?{ script }? |
| 347 | # |
| 348 |
| --- autosetup/cc.tcl | |
| +++ autosetup/cc.tcl | |
| @@ -331,17 +331,11 @@ | |
| 331 | # simply replaces the existing value. |
| 332 | # |
| 333 | # Returns the previous settings |
| 334 | proc cc-update-settings {args} { |
| 335 | set prev [cc-get-settings] |
| 336 | cc-store-settings [dict merge $prev $args] |
| 337 | return $prev |
| 338 | } |
| 339 | |
| 340 | # @cc-with settings ?{ script }? |
| 341 | # |
| 342 |