-#: fish/cmds.c:1437 fish/cmds.c:1449 fish/cmds.c:1462 fish/cmds.c:1476
-#: fish/cmds.c:1490 fish/cmds.c:1505 fish/cmds.c:1520 fish/cmds.c:1533
-#: fish/cmds.c:1548 fish/cmds.c:1561 fish/cmds.c:1576 fish/cmds.c:1589
-#: fish/cmds.c:1603 fish/cmds.c:1616 fish/cmds.c:1631 fish/cmds.c:1644
-#: fish/cmds.c:1658 fish/cmds.c:1672 fish/cmds.c:1686 fish/cmds.c:1700
-#: fish/cmds.c:1714 fish/cmds.c:1729 fish/cmds.c:1760 fish/cmds.c:1774
-#: fish/cmds.c:1788 fish/cmds.c:1804 fish/cmds.c:1817 fish/cmds.c:1832
-#: fish/cmds.c:1845 fish/cmds.c:1860 fish/cmds.c:1873 fish/cmds.c:1888
-#: fish/cmds.c:1901 fish/cmds.c:1917 fish/cmds.c:1933 fish/cmds.c:1949
-#: fish/cmds.c:1963 fish/cmds.c:1976 fish/cmds.c:1992 fish/cmds.c:2011
-#: fish/cmds.c:2030 fish/cmds.c:2048 fish/cmds.c:2063 fish/cmds.c:2078
-#: fish/cmds.c:2093 fish/cmds.c:2108 fish/cmds.c:2123 fish/cmds.c:2138
-#: fish/cmds.c:2153 fish/cmds.c:2169 fish/cmds.c:2189 fish/cmds.c:2223
-#: fish/cmds.c:2237 fish/cmds.c:2256 fish/cmds.c:2275 fish/cmds.c:2293
-#: fish/cmds.c:2310 fish/cmds.c:2326 fish/cmds.c:2343 fish/cmds.c:2358
-#: fish/cmds.c:2374 fish/cmds.c:2386 fish/cmds.c:2399 fish/cmds.c:2416
-#: fish/cmds.c:2432 fish/cmds.c:2448 fish/cmds.c:2464 fish/cmds.c:2480
-#: fish/cmds.c:2497 fish/cmds.c:2534 fish/cmds.c:2588 fish/cmds.c:2606
-#: fish/cmds.c:2624 fish/cmds.c:2642 fish/cmds.c:2657 fish/cmds.c:2676
-#: fish/cmds.c:2711 fish/cmds.c:2730 fish/cmds.c:2806 fish/cmds.c:2842
-#: fish/cmds.c:2855 fish/cmds.c:2870 fish/cmds.c:2882 fish/cmds.c:2895
-#: fish/cmds.c:2914 fish/cmds.c:2933 fish/cmds.c:2952 fish/cmds.c:2971
-#: fish/cmds.c:2990 fish/cmds.c:3009 fish/cmds.c:3026 fish/cmds.c:3040
-#: fish/cmds.c:3054 fish/cmds.c:3070 fish/cmds.c:3086 fish/cmds.c:3103
-#: fish/cmds.c:3136 fish/cmds.c:3152 fish/cmds.c:3168 fish/cmds.c:3182
-#: fish/cmds.c:3197 fish/cmds.c:3217 fish/cmds.c:3237 fish/cmds.c:3258
-#: fish/cmds.c:3278 fish/cmds.c:3296 fish/cmds.c:3316 fish/cmds.c:3336
-#: fish/cmds.c:3353 fish/cmds.c:3372 fish/cmds.c:3390 fish/cmds.c:3410
-#: fish/cmds.c:3424 fish/cmds.c:3438 fish/cmds.c:3453 fish/cmds.c:3468
-#: fish/cmds.c:3486 fish/cmds.c:3501 fish/cmds.c:3519 fish/cmds.c:3536
-#: fish/cmds.c:3551 fish/cmds.c:3569 fish/cmds.c:3589 fish/cmds.c:3609
-#: fish/cmds.c:3628 fish/cmds.c:3659 fish/cmds.c:3674 fish/cmds.c:3688
-#: fish/cmds.c:3709 fish/cmds.c:3729 fish/cmds.c:3749 fish/cmds.c:3768
-#: fish/cmds.c:3782 fish/cmds.c:3801 fish/cmds.c:3892 fish/cmds.c:3909
-#: fish/cmds.c:3926 fish/cmds.c:3943 fish/cmds.c:3958 fish/cmds.c:3976
-#: fish/cmds.c:4009 fish/cmds.c:4023 fish/cmds.c:4042 fish/cmds.c:4056
-#: fish/cmds.c:4089 fish/cmds.c:4106 fish/cmds.c:4123 fish/cmds.c:4140
-#: fish/cmds.c:4159 fish/cmds.c:4173 fish/cmds.c:4189 fish/cmds.c:4205
-#: fish/cmds.c:4224 fish/cmds.c:4242 fish/cmds.c:4260 fish/cmds.c:4278
-#: fish/cmds.c:4298 fish/cmds.c:4336 fish/cmds.c:4356 fish/cmds.c:4393
-#: fish/cmds.c:4408 fish/cmds.c:4424 fish/cmds.c:4442 fish/cmds.c:4462
-#: fish/cmds.c:4481 fish/cmds.c:4496 fish/cmds.c:4512 fish/cmds.c:4530
-#: fish/cmds.c:4604 fish/cmds.c:4642 fish/cmds.c:4718 fish/cmds.c:4791
-#: fish/cmds.c:4825 fish/cmds.c:4845 fish/cmds.c:4863 fish/cmds.c:4883
-#: fish/cmds.c:4902 fish/cmds.c:4924 fish/cmds.c:4964 fish/cmds.c:5002
-#: fish/cmds.c:5020 fish/cmds.c:5036 fish/cmds.c:5052 fish/cmds.c:5066
-#: fish/cmds.c:5081 fish/cmds.c:5105 fish/cmds.c:5126 fish/cmds.c:5147
-#: fish/cmds.c:5168 fish/cmds.c:5189 fish/cmds.c:5210 fish/cmds.c:5231
-#: fish/cmds.c:5252 fish/cmds.c:5273 fish/cmds.c:5294 fish/cmds.c:5315
-#: fish/cmds.c:5336 fish/cmds.c:5356 fish/cmds.c:5376 fish/cmds.c:5394
-#: fish/cmds.c:5412 fish/cmds.c:5430 fish/cmds.c:5447 fish/cmds.c:5467
-#: fish/cmds.c:5502 fish/cmds.c:5516 fish/cmds.c:5530 fish/cmds.c:5546
-#: fish/cmds.c:5562 fish/cmds.c:5576 fish/cmds.c:5590 fish/cmds.c:5604
-#: fish/cmds.c:5618 fish/cmds.c:5634 fish/cmds.c:5667 fish/cmds.c:5704
-#: fish/cmds.c:5735 fish/cmds.c:5750 fish/cmds.c:5765 fish/cmds.c:5778
-#: fish/cmds.c:5791 fish/cmds.c:5809 fish/cmds.c:5844 fish/cmds.c:5879
-#: fish/cmds.c:5915 fish/cmds.c:5952 fish/cmds.c:5990 fish/cmds.c:6028
-#: fish/cmds.c:6063 fish/cmds.c:6077 fish/cmds.c:6097 fish/cmds.c:6116
-#: fish/cmds.c:6135 fish/cmds.c:6152 fish/cmds.c:6169 fish/cmds.c:6202
-#: fish/cmds.c:6271 fish/cmds.c:6308 fish/cmds.c:6363 fish/cmds.c:6386
-#: fish/cmds.c:6409 fish/cmds.c:6434 fish/cmds.c:6490 fish/cmds.c:6508
-#: fish/cmds.c:6550 fish/cmds.c:6567 fish/cmds.c:6603 fish/cmds.c:6637
-#: fish/cmds.c:6654 fish/cmds.c:6673 fish/cmds.c:6727 fish/cmds.c:6744
-#: fish/cmds.c:6763 fish/cmds.c:6782 fish/cmds.c:6798 fish/cmds.c:6815
-#: fish/cmds.c:6839 fish/cmds.c:6856 fish/cmds.c:6873 fish/cmds.c:6890
-#: fish/cmds.c:6907 fish/cmds.c:6926 fish/cmds.c:6958 fish/cmds.c:6973
-#: fish/cmds.c:6993 fish/cmds.c:7012 fish/cmds.c:7025 fish/cmds.c:7039
-#: fish/cmds.c:7073 fish/cmds.c:7109 fish/cmds.c:7146 fish/cmds.c:7199
-#: fish/cmds.c:7218 fish/cmds.c:7251 fish/cmds.c:7264 fish/cmds.c:7281
-#: fish/cmds.c:7318 fish/cmds.c:7338 fish/cmds.c:7359
+#: fish/cmds.c:2058 fish/cmds.c:2070 fish/cmds.c:2083 fish/cmds.c:2097
+#: fish/cmds.c:2111 fish/cmds.c:2126 fish/cmds.c:2141 fish/cmds.c:2154
+#: fish/cmds.c:2169 fish/cmds.c:2182 fish/cmds.c:2197 fish/cmds.c:2210
+#: fish/cmds.c:2224 fish/cmds.c:2237 fish/cmds.c:2252 fish/cmds.c:2265
+#: fish/cmds.c:2279 fish/cmds.c:2293 fish/cmds.c:2307 fish/cmds.c:2321
+#: fish/cmds.c:2335 fish/cmds.c:2350 fish/cmds.c:2381 fish/cmds.c:2395
+#: fish/cmds.c:2409 fish/cmds.c:2425 fish/cmds.c:2438 fish/cmds.c:2453
+#: fish/cmds.c:2466 fish/cmds.c:2481 fish/cmds.c:2494 fish/cmds.c:2509
+#: fish/cmds.c:2522 fish/cmds.c:2538 fish/cmds.c:2554 fish/cmds.c:2570
+#: fish/cmds.c:2584 fish/cmds.c:2597 fish/cmds.c:2613 fish/cmds.c:2632
+#: fish/cmds.c:2651 fish/cmds.c:2669 fish/cmds.c:2684 fish/cmds.c:2699
+#: fish/cmds.c:2714 fish/cmds.c:2729 fish/cmds.c:2744 fish/cmds.c:2759
+#: fish/cmds.c:2774 fish/cmds.c:2790 fish/cmds.c:2810 fish/cmds.c:2844
+#: fish/cmds.c:2858 fish/cmds.c:2877 fish/cmds.c:2896 fish/cmds.c:2914
+#: fish/cmds.c:2931 fish/cmds.c:2947 fish/cmds.c:2964 fish/cmds.c:2979
+#: fish/cmds.c:2995 fish/cmds.c:3007 fish/cmds.c:3020 fish/cmds.c:3037
+#: fish/cmds.c:3053 fish/cmds.c:3069 fish/cmds.c:3085 fish/cmds.c:3101
+#: fish/cmds.c:3118 fish/cmds.c:3155 fish/cmds.c:3209 fish/cmds.c:3227
+#: fish/cmds.c:3245 fish/cmds.c:3263 fish/cmds.c:3278 fish/cmds.c:3297
+#: fish/cmds.c:3332 fish/cmds.c:3351 fish/cmds.c:3427 fish/cmds.c:3463
+#: fish/cmds.c:3476 fish/cmds.c:3491 fish/cmds.c:3503 fish/cmds.c:3516
+#: fish/cmds.c:3535 fish/cmds.c:3554 fish/cmds.c:3573 fish/cmds.c:3592
+#: fish/cmds.c:3611 fish/cmds.c:3630 fish/cmds.c:3647 fish/cmds.c:3661
+#: fish/cmds.c:3675 fish/cmds.c:3691 fish/cmds.c:3707 fish/cmds.c:3724
+#: fish/cmds.c:3757 fish/cmds.c:3773 fish/cmds.c:3789 fish/cmds.c:3803
+#: fish/cmds.c:3818 fish/cmds.c:3838 fish/cmds.c:3858 fish/cmds.c:3879
+#: fish/cmds.c:3899 fish/cmds.c:3917 fish/cmds.c:3937 fish/cmds.c:3957
+#: fish/cmds.c:3974 fish/cmds.c:3993 fish/cmds.c:4011 fish/cmds.c:4031
+#: fish/cmds.c:4045 fish/cmds.c:4059 fish/cmds.c:4074 fish/cmds.c:4089
+#: fish/cmds.c:4107 fish/cmds.c:4122 fish/cmds.c:4140 fish/cmds.c:4157
+#: fish/cmds.c:4172 fish/cmds.c:4190 fish/cmds.c:4210 fish/cmds.c:4230
+#: fish/cmds.c:4249 fish/cmds.c:4280 fish/cmds.c:4295 fish/cmds.c:4309
+#: fish/cmds.c:4330 fish/cmds.c:4350 fish/cmds.c:4370 fish/cmds.c:4389
+#: fish/cmds.c:4403 fish/cmds.c:4422 fish/cmds.c:4513 fish/cmds.c:4530
+#: fish/cmds.c:4547 fish/cmds.c:4564 fish/cmds.c:4579 fish/cmds.c:4597
+#: fish/cmds.c:4630 fish/cmds.c:4644 fish/cmds.c:4663 fish/cmds.c:4677
+#: fish/cmds.c:4710 fish/cmds.c:4727 fish/cmds.c:4744 fish/cmds.c:4761
+#: fish/cmds.c:4780 fish/cmds.c:4794 fish/cmds.c:4810 fish/cmds.c:4826
+#: fish/cmds.c:4845 fish/cmds.c:4863 fish/cmds.c:4881 fish/cmds.c:4899
+#: fish/cmds.c:4919 fish/cmds.c:4957 fish/cmds.c:4977 fish/cmds.c:5014
+#: fish/cmds.c:5029 fish/cmds.c:5045 fish/cmds.c:5063 fish/cmds.c:5083
+#: fish/cmds.c:5102 fish/cmds.c:5117 fish/cmds.c:5133 fish/cmds.c:5151
+#: fish/cmds.c:5225 fish/cmds.c:5263 fish/cmds.c:5339 fish/cmds.c:5412
+#: fish/cmds.c:5446 fish/cmds.c:5466 fish/cmds.c:5484 fish/cmds.c:5504
+#: fish/cmds.c:5523 fish/cmds.c:5545 fish/cmds.c:5585 fish/cmds.c:5623
+#: fish/cmds.c:5641 fish/cmds.c:5657 fish/cmds.c:5673 fish/cmds.c:5687
+#: fish/cmds.c:5702 fish/cmds.c:5726 fish/cmds.c:5747 fish/cmds.c:5768
+#: fish/cmds.c:5789 fish/cmds.c:5810 fish/cmds.c:5831 fish/cmds.c:5852
+#: fish/cmds.c:5873 fish/cmds.c:5894 fish/cmds.c:5915 fish/cmds.c:5936
+#: fish/cmds.c:5957 fish/cmds.c:5977 fish/cmds.c:5997 fish/cmds.c:6015
+#: fish/cmds.c:6033 fish/cmds.c:6051 fish/cmds.c:6068 fish/cmds.c:6088
+#: fish/cmds.c:6123 fish/cmds.c:6137 fish/cmds.c:6151 fish/cmds.c:6167
+#: fish/cmds.c:6183 fish/cmds.c:6197 fish/cmds.c:6211 fish/cmds.c:6225
+#: fish/cmds.c:6239 fish/cmds.c:6255 fish/cmds.c:6288 fish/cmds.c:6325
+#: fish/cmds.c:6356 fish/cmds.c:6371 fish/cmds.c:6386 fish/cmds.c:6399
+#: fish/cmds.c:6412 fish/cmds.c:6430 fish/cmds.c:6465 fish/cmds.c:6500
+#: fish/cmds.c:6536 fish/cmds.c:6573 fish/cmds.c:6611 fish/cmds.c:6649
+#: fish/cmds.c:6684 fish/cmds.c:6698 fish/cmds.c:6718 fish/cmds.c:6737
+#: fish/cmds.c:6756 fish/cmds.c:6773 fish/cmds.c:6790 fish/cmds.c:6823
+#: fish/cmds.c:6892 fish/cmds.c:6929 fish/cmds.c:6984 fish/cmds.c:7007
+#: fish/cmds.c:7030 fish/cmds.c:7055 fish/cmds.c:7111 fish/cmds.c:7129
+#: fish/cmds.c:7171 fish/cmds.c:7188 fish/cmds.c:7224 fish/cmds.c:7258
+#: fish/cmds.c:7275 fish/cmds.c:7294 fish/cmds.c:7348 fish/cmds.c:7365
+#: fish/cmds.c:7384 fish/cmds.c:7403 fish/cmds.c:7419 fish/cmds.c:7436
+#: fish/cmds.c:7460 fish/cmds.c:7477 fish/cmds.c:7494 fish/cmds.c:7511
+#: fish/cmds.c:7528 fish/cmds.c:7547 fish/cmds.c:7579 fish/cmds.c:7594
+#: fish/cmds.c:7614 fish/cmds.c:7633 fish/cmds.c:7646 fish/cmds.c:7660
+#: fish/cmds.c:7694 fish/cmds.c:7730 fish/cmds.c:7767 fish/cmds.c:7820
+#: fish/cmds.c:7839 fish/cmds.c:7872 fish/cmds.c:7885 fish/cmds.c:7902
+#: fish/cmds.c:7939 fish/cmds.c:7959 fish/cmds.c:7980 fish/cmds.c:8002
+#: fish/cmds.c:8040 fish/cmds.c:8061 fish/cmds.c:8095 fish/cmds.c:8123
+#: fish/cmds.c:8151 fish/cmds.c:8177 fish/cmds.c:8194 fish/cmds.c:8223
+#: fish/cmds.c:8240