.ar fixed and constituent line numbers off (until they are right)

FossilOrigin-Name: ec363f81ce775bb3313d08a959e1573f694f18eb4699a33a9b98ce241056292e

diff --git a/manifest b/manifest
index 495c464001d7295f5897f98b77bc6926b83893bd..221fd3e5e97eb7ae70206e0f15dada1bdf9ed8fc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sfrom\strunk,\sw/adapations.\s(.ar\sstill\sbroken)
-D 2022-01-17T03:53:37.069
+C .ar\sfixed\sand\sconstituent\sline\snumbers\soff\s(until\sthey\sare\sright)
+D 2022-01-17T17:22:53.220
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -513,7 +513,7 @@ F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c e528416ff5d86fc5d656ea6a26f03fde39836b6175f93048c32a03cb2ee16743
-F src/json.c f3bbaf6a4df6f5ada5b71e01666f5cd67642c616cd8be47dbfa5b5768dfa71d4 w ext/misc/json1.c
+F src/json.c f3bbaf6a4df6f5ada5b71e01666f5cd67642c616cd8be47dbfa5b5768dfa71d4
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 95db1fe62c5973f1c5d9c53f6083e21a73ece14cdd47eeca0639691332e85c4d
 F src/main.c 2b6b0dbfeb14d4bb57e368604b0736b2aa42b51b00339d399b01d6b1fc9b4960
@@ -554,7 +554,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c 359bc0e445d427583d2ab6110433a5dc777f64a0ecdf8d24826d8b475233ead9
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c a4a23a70f0a24a1103ac9698f6be181a6ec7ff6c19e03e8899c43cb6d2af09d6
-F src/shell.c.in 91c860b881d35f3d343ccb610d8db78c57d06aa01a00d7c59ee2f7530fab2553
+F src/shell.c.in cdcb686aad93a51bd888b314f6c0fc00b20151d97a938b0771e666496e798e12
 F src/shext_linkage.h 5897e8140a06cb733d07a927994b30d41225eb93b5b8cf2ad0e3460cb4e95fd6
 F src/sqlite.h.in a5e0d6bd47e67aabf1475986d36bdcc7bfa9e06566790ebf8e3aa7fa551c9f99
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1875,7 +1875,7 @@ F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61
 F tool/mkopcodeh.tcl 130b88697da6ec5b89b41844d955d08fb62c2552e889dec8c7bcecb28d8f50bd
 F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
 F tool/mkpragmatab.tcl de206c64b6e9ac8cd5e3cbd0ffe456f07d5710605ef8385d677e60ce3335ea12
-F tool/mkshellc.tcl a6cbfb2bfa5bb826a6aae4a068e7636576b1d9076610a29281391df3120dbd20
+F tool/mkshellc.tcl 160d16067f71caeb54cbebd09c12c3e545c77f46d9714cc8e7219407b3d3001b
 F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl 4f7cfef5152b0c91920355cbfc1d608a4ad242cb819f1aea07f6d0274f584a7f
@@ -1941,8 +1941,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e38f45cdc5694dc126bc6a41d3657807fc9953487f4ae26a802a00cbbd12aa61 4883776669ee2f2310ea82b0d6df4d008eebaa7cb252102539cf21a635402ebb
-R 2792444b019f416450346dfe07444ddd
+P e09a6dd7b9de6c53e1dd59967c3455b38551024bb8d5d1606e7e7324b3b65931
+R 1dd8fb7871fba4bad4bc518faf171ce6
 U larrybr
-Z 17f54a1c991e5b81fbd749e44dce19c6
+Z dff757fa5b4664ef427a6a6f0d132a50
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 5d790fd8675c2c8599206732533f49bbafccfd92..8ee50daf9b064870f6f283a655b37163d1307095 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e09a6dd7b9de6c53e1dd59967c3455b38551024bb8d5d1606e7e7324b3b65931
\ No newline at end of file
+ec363f81ce775bb3313d08a959e1573f694f18eb4699a33a9b98ce241056292e
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 77930c29f6c750317709ffbd0d7f3dbe16b3f99f..e14346054e6cd7edb3dd676db09d7a2a40cb71ae 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -7282,7 +7282,7 @@ COLLECT_HELP_TEXT[
   "   See also:",
   "      http://sqlite.org/cli.html#sqlite_archive_support",
 ];
-DISPATCHABLE_COMMAND( archive ? 3 0 azArg nArg p ){
+DISPATCHABLE_COMMAND( archive ? 0 0 azArg nArg p ){
   open_db(p, 0);
   if( p->bSafeMode ) return SHELL_FORBIDDEN_OP;
   return arDotCommand(p, 0, azArg, nArg);
@@ -10928,7 +10928,6 @@ COLLECT_HELP_TEXT[
 ];
 DISPATCHABLE_COMMAND( width ? 1 0 ){
   int j;
-  assert( nArg<=ArraySize(azArg) );
   p->nWidth = nArg-1;
   p->colWidth = realloc(p->colWidth, (p->nWidth+1)*sizeof(int)*2);
   if( p->colWidth==0 && p->nWidth>0 ) shell_out_of_memory();

diff --git a/tool/mkshellc.tcl b/tool/mkshellc.tcl
index b8c69382ddc2bc70f9af1fe9998135c5104a12e8..9328991cddb0724e77215254eec9f8116844d6d0 100644 (file)
--- a/tool/mkshellc.tcl
+++ b/tool/mkshellc.tcl
@@ -74,7 +74,7 @@ set ::headCommentLines [expr 1+[regexp -all "\n" $::headComment]]
 set ::topDir [file dir [file dir [file normal $argv0]]]
 set runMode normal
 
-set ::lineTags 1 ; # 0 => none, 1 => source change, 2 => line syncs, 3 => more
+set ::lineTags 0 ; # 0 => none, 1 => source change, 2 => line syncs, 3 => more
 
 set ::tclGenerate 0
 set ::verbosity 0