-#: fish/cmds.c:3474 fish/cmds.c:3488 fish/cmds.c:3504 fish/cmds.c:3521
-#: fish/cmds.c:3538 fish/cmds.c:3556 fish/cmds.c:3575 fish/cmds.c:3591
-#: fish/cmds.c:3609 fish/cmds.c:3625 fish/cmds.c:3643 fish/cmds.c:3659
-#: fish/cmds.c:3676 fish/cmds.c:3691 fish/cmds.c:3709 fish/cmds.c:3724
-#: fish/cmds.c:3740 fish/cmds.c:3756 fish/cmds.c:3772 fish/cmds.c:3788
-#: fish/cmds.c:3804 fish/cmds.c:3822 fish/cmds.c:3855 fish/cmds.c:3871
-#: fish/cmds.c:3887 fish/cmds.c:3906 fish/cmds.c:3921 fish/cmds.c:3939
-#: fish/cmds.c:3954 fish/cmds.c:3972 fish/cmds.c:3987 fish/cmds.c:4005
-#: fish/cmds.c:4020 fish/cmds.c:4039 fish/cmds.c:4058 fish/cmds.c:4076
-#: fish/cmds.c:4096 fish/cmds.c:4115 fish/cmds.c:4135 fish/cmds.c:4155
-#: fish/cmds.c:4175 fish/cmds.c:4194 fish/cmds.c:4213 fish/cmds.c:4233
-#: fish/cmds.c:4253 fish/cmds.c:4273 fish/cmds.c:4288 fish/cmds.c:4304
-#: fish/cmds.c:4325 fish/cmds.c:4376 fish/cmds.c:4394 fish/cmds.c:4411
-#: fish/cmds.c:4432 fish/cmds.c:4485 fish/cmds.c:4505 fish/cmds.c:4525
-#: fish/cmds.c:4546 fish/cmds.c:4562 fish/cmds.c:4578 fish/cmds.c:4597
-#: fish/cmds.c:4619 fish/cmds.c:4641 fish/cmds.c:4661 fish/cmds.c:4678
-#: fish/cmds.c:4695 fish/cmds.c:4712 fish/cmds.c:4729 fish/cmds.c:4746
-#: fish/cmds.c:4763 fish/cmds.c:4780 fish/cmds.c:4799 fish/cmds.c:4822
-#: fish/cmds.c:4858 fish/cmds.c:4875 fish/cmds.c:4898 fish/cmds.c:4920
-#: fish/cmds.c:4941 fish/cmds.c:4961 fish/cmds.c:4980 fish/cmds.c:5000
-#: fish/cmds.c:5018 fish/cmds.c:5036 fish/cmds.c:5050 fish/cmds.c:5066
-#: fish/cmds.c:5086 fish/cmds.c:5105 fish/cmds.c:5124 fish/cmds.c:5143
-#: fish/cmds.c:5162 fish/cmds.c:5182 fish/cmds.c:5222 fish/cmds.c:5279
-#: fish/cmds.c:5300 fish/cmds.c:5321 fish/cmds.c:5342 fish/cmds.c:5360
-#: fish/cmds.c:5382 fish/cmds.c:5420 fish/cmds.c:5442 fish/cmds.c:5521
-#: fish/cmds.c:5560 fish/cmds.c:5575 fish/cmds.c:5592 fish/cmds.c:5606
-#: fish/cmds.c:5622 fish/cmds.c:5644 fish/cmds.c:5666 fish/cmds.c:5688
-#: fish/cmds.c:5710 fish/cmds.c:5732 fish/cmds.c:5754 fish/cmds.c:5774
-#: fish/cmds.c:5791 fish/cmds.c:5808 fish/cmds.c:5827 fish/cmds.c:5846
-#: fish/cmds.c:5866 fish/cmds.c:5902 fish/cmds.c:5921 fish/cmds.c:5940
-#: fish/cmds.c:5957 fish/cmds.c:5975 fish/cmds.c:5998 fish/cmds.c:6021
-#: fish/cmds.c:6045 fish/cmds.c:6068 fish/cmds.c:6089 fish/cmds.c:6112
-#: fish/cmds.c:6135 fish/cmds.c:6155 fish/cmds.c:6177 fish/cmds.c:6198
-#: fish/cmds.c:6221 fish/cmds.c:6238 fish/cmds.c:6255 fish/cmds.c:6273
-#: fish/cmds.c:6291 fish/cmds.c:6312 fish/cmds.c:6330 fish/cmds.c:6351
-#: fish/cmds.c:6371 fish/cmds.c:6389 fish/cmds.c:6410 fish/cmds.c:6433
-#: fish/cmds.c:6456 fish/cmds.c:6478 fish/cmds.c:6511 fish/cmds.c:6528
-#: fish/cmds.c:6545 fish/cmds.c:6569 fish/cmds.c:6592 fish/cmds.c:6615
-#: fish/cmds.c:6637 fish/cmds.c:6654 fish/cmds.c:6676 fish/cmds.c:6770
-#: fish/cmds.c:6790 fish/cmds.c:6810 fish/cmds.c:6830 fish/cmds.c:6848
-#: fish/cmds.c:6869 fish/cmds.c:6905 fish/cmds.c:6922 fish/cmds.c:6944
-#: fish/cmds.c:6961 fish/cmds.c:6997 fish/cmds.c:7017 fish/cmds.c:7037
-#: fish/cmds.c:7057 fish/cmds.c:7079 fish/cmds.c:7096 fish/cmds.c:7115
-#: fish/cmds.c:7134 fish/cmds.c:7156 fish/cmds.c:7177 fish/cmds.c:7198
-#: fish/cmds.c:7219 fish/cmds.c:7242 fish/cmds.c:7283 fish/cmds.c:7306
-#: fish/cmds.c:7345 fish/cmds.c:7362 fish/cmds.c:7381 fish/cmds.c:7402
-#: fish/cmds.c:7425 fish/cmds.c:7447 fish/cmds.c:7465 fish/cmds.c:7484
-#: fish/cmds.c:7505 fish/cmds.c:7582 fish/cmds.c:7623 fish/cmds.c:7702
-#: fish/cmds.c:7778 fish/cmds.c:7815 fish/cmds.c:7838 fish/cmds.c:7859
-#: fish/cmds.c:7882 fish/cmds.c:7904 fish/cmds.c:7929 fish/cmds.c:7972
-#: fish/cmds.c:8013 fish/cmds.c:8034 fish/cmds.c:8052 fish/cmds.c:8071
-#: fish/cmds.c:8088 fish/cmds.c:8106 fish/cmds.c:8133 fish/cmds.c:8157
-#: fish/cmds.c:8181 fish/cmds.c:8205 fish/cmds.c:8229 fish/cmds.c:8253
-#: fish/cmds.c:8277 fish/cmds.c:8301 fish/cmds.c:8325 fish/cmds.c:8349
-#: fish/cmds.c:8373 fish/cmds.c:8397 fish/cmds.c:8420 fish/cmds.c:8443
-#: fish/cmds.c:8464 fish/cmds.c:8485 fish/cmds.c:8506 fish/cmds.c:8526
-#: fish/cmds.c:8549 fish/cmds.c:8587 fish/cmds.c:8604 fish/cmds.c:8621
-#: fish/cmds.c:8640 fish/cmds.c:8659 fish/cmds.c:8676 fish/cmds.c:8693
-#: fish/cmds.c:8710 fish/cmds.c:8727 fish/cmds.c:8746 fish/cmds.c:8782
-#: fish/cmds.c:8822 fish/cmds.c:8855 fish/cmds.c:8872 fish/cmds.c:8889
-#: fish/cmds.c:8905 fish/cmds.c:8920 fish/cmds.c:8941 fish/cmds.c:8979
-#: fish/cmds.c:9017 fish/cmds.c:9056 fish/cmds.c:9096 fish/cmds.c:9137
-#: fish/cmds.c:9178 fish/cmds.c:9216 fish/cmds.c:9233 fish/cmds.c:9256
-#: fish/cmds.c:9278 fish/cmds.c:9300 fish/cmds.c:9320 fish/cmds.c:9340
-#: fish/cmds.c:9376 fish/cmds.c:9448 fish/cmds.c:9488 fish/cmds.c:9546
-#: fish/cmds.c:9572 fish/cmds.c:9598 fish/cmds.c:9626 fish/cmds.c:9685
-#: fish/cmds.c:9706 fish/cmds.c:9751 fish/cmds.c:9771 fish/cmds.c:9810
-#: fish/cmds.c:9847 fish/cmds.c:9867 fish/cmds.c:9889 fish/cmds.c:9946
-#: fish/cmds.c:9966 fish/cmds.c:9988 fish/cmds.c:10010 fish/cmds.c:10029
-#: fish/cmds.c:10049 fish/cmds.c:10076 fish/cmds.c:10096 fish/cmds.c:10116
-#: fish/cmds.c:10136 fish/cmds.c:10156 fish/cmds.c:10178 fish/cmds.c:10213
-#: fish/cmds.c:10231 fish/cmds.c:10254 fish/cmds.c:10276 fish/cmds.c:10291
-#: fish/cmds.c:10308 fish/cmds.c:10345 fish/cmds.c:10384 fish/cmds.c:10424
-#: fish/cmds.c:10480 fish/cmds.c:10502 fish/cmds.c:10538 fish/cmds.c:10553
-#: fish/cmds.c:10573 fish/cmds.c:10613 fish/cmds.c:10636 fish/cmds.c:10660
-#: fish/cmds.c:10685 fish/cmds.c:10726 fish/cmds.c:10751 fish/cmds.c:10789
-#: fish/cmds.c:10820 fish/cmds.c:10851 fish/cmds.c:10879 fish/cmds.c:10899
-#: fish/cmds.c:10931 fish/cmds.c:10951 fish/cmds.c:10971 fish/cmds.c:10988
-#: fish/cmds.c:11006 fish/cmds.c:11029 fish/cmds.c:11050 fish/cmds.c:11069
-#: fish/cmds.c:11111 fish/cmds.c:11154 fish/cmds.c:11198 fish/cmds.c:11237
-#: fish/cmds.c:11256 fish/cmds.c:11276 fish/cmds.c:11296 fish/cmds.c:11317
-#: fish/cmds.c:11338 fish/cmds.c:11359 fish/cmds.c:11380 fish/cmds.c:11401
-#: fish/cmds.c:11423 fish/cmds.c:11461 fish/cmds.c:11512 fish/cmds.c:11550
-#: fish/cmds.c:11606
+#: fish/cmds.c:3143 fish/cmds.c:3157 fish/cmds.c:3173 fish/cmds.c:3190
+#: fish/cmds.c:3207 fish/cmds.c:3225 fish/cmds.c:3244 fish/cmds.c:3260
+#: fish/cmds.c:3278 fish/cmds.c:3294 fish/cmds.c:3312 fish/cmds.c:3328
+#: fish/cmds.c:3345 fish/cmds.c:3360 fish/cmds.c:3378 fish/cmds.c:3393
+#: fish/cmds.c:3409 fish/cmds.c:3425 fish/cmds.c:3441 fish/cmds.c:3457
+#: fish/cmds.c:3473 fish/cmds.c:3491 fish/cmds.c:3524 fish/cmds.c:3540
+#: fish/cmds.c:3556 fish/cmds.c:3575 fish/cmds.c:3590 fish/cmds.c:3608
+#: fish/cmds.c:3623 fish/cmds.c:3641 fish/cmds.c:3656 fish/cmds.c:3674
+#: fish/cmds.c:3689 fish/cmds.c:3708 fish/cmds.c:3727 fish/cmds.c:3745
+#: fish/cmds.c:3765 fish/cmds.c:3784 fish/cmds.c:3804 fish/cmds.c:3824
+#: fish/cmds.c:3844 fish/cmds.c:3863 fish/cmds.c:3882 fish/cmds.c:3902
+#: fish/cmds.c:3922 fish/cmds.c:3942 fish/cmds.c:3957 fish/cmds.c:3973
+#: fish/cmds.c:3994 fish/cmds.c:4045 fish/cmds.c:4063 fish/cmds.c:4080
+#: fish/cmds.c:4101 fish/cmds.c:4154 fish/cmds.c:4174 fish/cmds.c:4194
+#: fish/cmds.c:4214 fish/cmds.c:4235 fish/cmds.c:4251 fish/cmds.c:4267
+#: fish/cmds.c:4286 fish/cmds.c:4308 fish/cmds.c:4330 fish/cmds.c:4350
+#: fish/cmds.c:4367 fish/cmds.c:4384 fish/cmds.c:4401 fish/cmds.c:4418
+#: fish/cmds.c:4435 fish/cmds.c:4452 fish/cmds.c:4469 fish/cmds.c:4488
+#: fish/cmds.c:4511 fish/cmds.c:4547 fish/cmds.c:4564 fish/cmds.c:4587
+#: fish/cmds.c:4609 fish/cmds.c:4630 fish/cmds.c:4650 fish/cmds.c:4669
+#: fish/cmds.c:4689 fish/cmds.c:4707 fish/cmds.c:4725 fish/cmds.c:4739
+#: fish/cmds.c:4755 fish/cmds.c:4775 fish/cmds.c:4794 fish/cmds.c:4813
+#: fish/cmds.c:4832 fish/cmds.c:4851 fish/cmds.c:4871 fish/cmds.c:4911
+#: fish/cmds.c:4968 fish/cmds.c:4989 fish/cmds.c:5010 fish/cmds.c:5031
+#: fish/cmds.c:5049 fish/cmds.c:5071 fish/cmds.c:5109 fish/cmds.c:5131
+#: fish/cmds.c:5210 fish/cmds.c:5249 fish/cmds.c:5264 fish/cmds.c:5281
+#: fish/cmds.c:5295 fish/cmds.c:5311 fish/cmds.c:5333 fish/cmds.c:5355
+#: fish/cmds.c:5377 fish/cmds.c:5399 fish/cmds.c:5421 fish/cmds.c:5443
+#: fish/cmds.c:5463 fish/cmds.c:5480 fish/cmds.c:5497 fish/cmds.c:5516
+#: fish/cmds.c:5535 fish/cmds.c:5555 fish/cmds.c:5591 fish/cmds.c:5610
+#: fish/cmds.c:5629 fish/cmds.c:5646 fish/cmds.c:5664 fish/cmds.c:5687
+#: fish/cmds.c:5710 fish/cmds.c:5734 fish/cmds.c:5757 fish/cmds.c:5778
+#: fish/cmds.c:5801 fish/cmds.c:5824 fish/cmds.c:5844 fish/cmds.c:5866
+#: fish/cmds.c:5887 fish/cmds.c:5910 fish/cmds.c:5927 fish/cmds.c:5944
+#: fish/cmds.c:5962 fish/cmds.c:5980 fish/cmds.c:6001 fish/cmds.c:6019
+#: fish/cmds.c:6040 fish/cmds.c:6060 fish/cmds.c:6078 fish/cmds.c:6099
+#: fish/cmds.c:6122 fish/cmds.c:6145 fish/cmds.c:6167 fish/cmds.c:6200
+#: fish/cmds.c:6217 fish/cmds.c:6234 fish/cmds.c:6258 fish/cmds.c:6281
+#: fish/cmds.c:6304 fish/cmds.c:6326 fish/cmds.c:6343 fish/cmds.c:6365
+#: fish/cmds.c:6459 fish/cmds.c:6479 fish/cmds.c:6499 fish/cmds.c:6519
+#: fish/cmds.c:6537 fish/cmds.c:6558 fish/cmds.c:6594 fish/cmds.c:6611
+#: fish/cmds.c:6633 fish/cmds.c:6650 fish/cmds.c:6686 fish/cmds.c:6706
+#: fish/cmds.c:6726 fish/cmds.c:6746 fish/cmds.c:6768 fish/cmds.c:6785
+#: fish/cmds.c:6804 fish/cmds.c:6823 fish/cmds.c:6845 fish/cmds.c:6866
+#: fish/cmds.c:6887 fish/cmds.c:6908 fish/cmds.c:6931 fish/cmds.c:6972
+#: fish/cmds.c:6995 fish/cmds.c:7034 fish/cmds.c:7051 fish/cmds.c:7070
+#: fish/cmds.c:7091 fish/cmds.c:7114 fish/cmds.c:7136 fish/cmds.c:7154
+#: fish/cmds.c:7173 fish/cmds.c:7194 fish/cmds.c:7271 fish/cmds.c:7312
+#: fish/cmds.c:7391 fish/cmds.c:7467 fish/cmds.c:7504 fish/cmds.c:7527
+#: fish/cmds.c:7548 fish/cmds.c:7571 fish/cmds.c:7593 fish/cmds.c:7618
+#: fish/cmds.c:7661 fish/cmds.c:7702 fish/cmds.c:7723 fish/cmds.c:7741
+#: fish/cmds.c:7760 fish/cmds.c:7777 fish/cmds.c:7795 fish/cmds.c:7822
+#: fish/cmds.c:7846 fish/cmds.c:7870 fish/cmds.c:7894 fish/cmds.c:7918
+#: fish/cmds.c:7942 fish/cmds.c:7966 fish/cmds.c:7990 fish/cmds.c:8014
+#: fish/cmds.c:8038 fish/cmds.c:8062 fish/cmds.c:8086 fish/cmds.c:8109
+#: fish/cmds.c:8132 fish/cmds.c:8153 fish/cmds.c:8174 fish/cmds.c:8195
+#: fish/cmds.c:8215 fish/cmds.c:8238 fish/cmds.c:8276 fish/cmds.c:8293
+#: fish/cmds.c:8310 fish/cmds.c:8329 fish/cmds.c:8348 fish/cmds.c:8365
+#: fish/cmds.c:8382 fish/cmds.c:8399 fish/cmds.c:8416 fish/cmds.c:8435
+#: fish/cmds.c:8471 fish/cmds.c:8511 fish/cmds.c:8544 fish/cmds.c:8561
+#: fish/cmds.c:8578 fish/cmds.c:8594 fish/cmds.c:8609 fish/cmds.c:8630
+#: fish/cmds.c:8668 fish/cmds.c:8706 fish/cmds.c:8745 fish/cmds.c:8785
+#: fish/cmds.c:8826 fish/cmds.c:8867 fish/cmds.c:8905 fish/cmds.c:8922
+#: fish/cmds.c:8945 fish/cmds.c:8967 fish/cmds.c:8989 fish/cmds.c:9009
+#: fish/cmds.c:9029 fish/cmds.c:9065 fish/cmds.c:9137 fish/cmds.c:9177
+#: fish/cmds.c:9235 fish/cmds.c:9261 fish/cmds.c:9287 fish/cmds.c:9315
+#: fish/cmds.c:9374 fish/cmds.c:9395 fish/cmds.c:9440 fish/cmds.c:9460
+#: fish/cmds.c:9499 fish/cmds.c:9536 fish/cmds.c:9556 fish/cmds.c:9578
+#: fish/cmds.c:9635 fish/cmds.c:9655 fish/cmds.c:9677 fish/cmds.c:9699
+#: fish/cmds.c:9718 fish/cmds.c:9738 fish/cmds.c:9765 fish/cmds.c:9785
+#: fish/cmds.c:9805 fish/cmds.c:9825 fish/cmds.c:9845 fish/cmds.c:9867
+#: fish/cmds.c:9902 fish/cmds.c:9920 fish/cmds.c:9943 fish/cmds.c:9965
+#: fish/cmds.c:9980 fish/cmds.c:9997 fish/cmds.c:10034 fish/cmds.c:10073
+#: fish/cmds.c:10113 fish/cmds.c:10169 fish/cmds.c:10191 fish/cmds.c:10227
+#: fish/cmds.c:10242 fish/cmds.c:10262 fish/cmds.c:10302 fish/cmds.c:10325
+#: fish/cmds.c:10349 fish/cmds.c:10374 fish/cmds.c:10415 fish/cmds.c:10440
+#: fish/cmds.c:10478 fish/cmds.c:10509 fish/cmds.c:10540 fish/cmds.c:10568
+#: fish/cmds.c:10588 fish/cmds.c:10620 fish/cmds.c:10640 fish/cmds.c:10660
+#: fish/cmds.c:10677 fish/cmds.c:10695 fish/cmds.c:10718 fish/cmds.c:10739
+#: fish/cmds.c:10758 fish/cmds.c:10800 fish/cmds.c:10843 fish/cmds.c:10887
+#: fish/cmds.c:10926 fish/cmds.c:10945 fish/cmds.c:10965 fish/cmds.c:10985
+#: fish/cmds.c:11006 fish/cmds.c:11027 fish/cmds.c:11048 fish/cmds.c:11069
+#: fish/cmds.c:11090 fish/cmds.c:11112 fish/cmds.c:11150 fish/cmds.c:11201
+#: fish/cmds.c:11239 fish/cmds.c:11295 fish/cmds.c:11318