Sync to trunk

FossilOrigin-Name: f51a17b6271a8dd7c48725e4ec2df1fde0460866c81c7225dc27216ab389591e

diff --cc manifest
index 1fdb6dec8be45517c7bf804fa8000fa7da196797,3fd894d1bc4cf452dc618b40ecdcdfbf8ed043de..7988d191d1c8cb24758a85f0612d77289596f72d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Cleanup\sdot-command\shandling,\smake\smulti-line\swork,\shonor\sexit\srequests\sfrom\smore\scontexts
- D 2022-01-31T19:23:32.887
 -C Fix\sharmless\scompiler\swarnings\sin\sMSVC.
 -D 2022-01-31T16:29:06.213
++C Sync\sto\strunk
++D 2022-01-31T19:52:30.524
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -553,7 -553,7 +553,7 @@@ F src/random.c 097dc8b31b8fba5a9aca1697
  F src/resolve.c 24032ae57aec10df2f3fa2e20be0aae7d256bc704124b76c52d763440c7c0fe9
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
  F src/select.c a6d2d4bed279d7fe4fcedaf297eaf6441e8e17c6e3947a32d24d23be52ac02f2
- F src/shell.c.in 4424f30c3b6fa8075da6edf8657895851d95133535af489249d9f6fd31b3ac1a
 -F src/shell.c.in 252de95a2ba4ab1808b2bacc00644389a72c61ffd61c7193e5b319cc126a5c52
++F src/shell.c.in 55d2161e0da793ad38c84e391f6aebf81e687ab3e8389d9c51dd05e3ebef0c45
  F src/sqlite.h.in eaade58049152dac850d57415bcced885ca27ae9582f8aea2cfb7f1db78a521b
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 5d54cf13d3406d8eb65d921a0d3c349de6126b732e695e79ecd4830ce86b4f8a
@@@ -1386,10 -1386,10 +1386,10 @@@ F test/sharedA.test 49d87ec54ab640fbbc3
  F test/sharedB.test 16cc7178e20965d75278f410943109b77b2e645e
  F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939
  F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
- F test/shell1.test 70f46b5d07776a107335c3c2c9cbd0431d44637bfeae1f6b9ded5e33b4c7c0bf
+ F test/shell1.test ce2f370886645f38fabdde44976c14a004400f166edea8fdd9741079b645fef6
  F test/shell2.test f00a0501c00583cbc46f7510e1d713366326b2b3e63d06d15937284171a8787c
 -F test/shell3.test cb4b835a901742c9719437a89171172ecc4a8823ad97349af8e4e841e6f82566
 -F test/shell4.test 8f6c0fce4abed19a8a7f7262517149812a04caa905d01bdc8f5e92573504b759
 +F test/shell3.test 3fed756f9e254d638b012fc018f5125e2f15bf79a824a4f474405b3aad9f0fb8
 +F test/shell4.test 823b84d39d4dc7a78b7570342b7e43dc32805fa8ee92e5b40a89775c3170dac1
  F test/shell5.test b85069bfcf3159b225228629ab2c3e69aa923d098fea8ea074b5dcd743522e2c
  F test/shell6.test 1ceb51b2678c472ba6cf1e5da96679ce8347889fe2c3bf93a0e0fa73f00b00d3
  F test/shell7.test 115132f66d0463417f408562cc2cf534f6bbc6d83a6d50f0072a9eb171bae97f
@@@ -1942,8 -1942,8 +1942,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 59693d3e732bbfd4855d97c55e91ad3fbc9d22ebd2c073c5debe958e8100c93e
- R 183362d79d916a1a03ae235575ff10ea
 -P f8766231d2a77bb8b95726b514736d4c2d20b056f7fe60bdbc98ebf5e5b15ae9
 -R 6c51010444b3de981e88513b2160fc76
 -U drh
 -Z 405a35ed61d67534b5e5df8c9cf5fafe
++P 5cf66e89071b619d116a4707b6ff1cd7917edffe5ab504514f37da433a77b61d 3ec6141c41a71eea0d96a65aa35c828e4d852d60e090513c312b925d0e257f9a
++R 8a6470510b0d975aef4cae0efde55caf
 +U larrybr
- Z add4c9190edfa3f82cfa473c5298219b
++Z adeafb366e133cc01524fb4c6c546d1f
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index b3e64aea77180ee8cb866089f1e55ebc6d58a108,0fd822b0912f724321d8250253e007796ffa4628..815cba63882106e825897d59fd91458b9348766d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5cf66e89071b619d116a4707b6ff1cd7917edffe5ab504514f37da433a77b61d
 -3ec6141c41a71eea0d96a65aa35c828e4d852d60e090513c312b925d0e257f9a
++f51a17b6271a8dd7c48725e4ec2df1fde0460866c81c7225dc27216ab389591e

diff --cc src/shell.c.in
index 60deebf09a6d62ca5258549f16f33c8761aa3890,c53b9104ff6f47aff484b5135a520e34b39d3e64..42149f77868fd26d74f369fa407295c266bc6755
--- 1/src/shell.c.in
--- 2/src/shell.c.in
+++ b/src/shell.c.in
@@@ -1219,8 -1084,9 +1219,10 @@@ struct ShellState 
    u8 eTraceType;         /* SHELL_TRACE_* value for type of trace */
    u8 bSafeMode;          /* True to prohibit unsafe operations */
    u8 bSafeModePersist;   /* The long-term value of bSafeMode */
 -  u8 bQuote;             /* Quote results for .mode box and table */
 -  int iWrap;             /* Wrap lines this long or longer in some output modes */
 +  u8 bExtendedDotCmds;   /* Bits set to enable various shell extensions */
    unsigned statsOn;      /* True to display memory stats before each finalize */
++  u8 bQuote;             /* Quote results for .mode box and table */
++  int iWrap;             /* In columnar modes, wrap lines reaching this limit */
    unsigned mEqpLines;    /* Mask of veritical lines in the EQP output graph */
    int inputNesting;      /* Track nesting level of .read and other redirects */
    int outCount;          /* Revert to stdout when reaching zero */