-#: fish/cmds.c:2366 fish/cmds.c:2379 fish/cmds.c:2394 fish/cmds.c:2410
-#: fish/cmds.c:2426 fish/cmds.c:2443 fish/cmds.c:2461 fish/cmds.c:2476
-#: fish/cmds.c:2493 fish/cmds.c:2508 fish/cmds.c:2525 fish/cmds.c:2540
-#: fish/cmds.c:2556 fish/cmds.c:2570 fish/cmds.c:2587 fish/cmds.c:2601
-#: fish/cmds.c:2616 fish/cmds.c:2631 fish/cmds.c:2646 fish/cmds.c:2661
-#: fish/cmds.c:2676 fish/cmds.c:2693 fish/cmds.c:2725 fish/cmds.c:2740
-#: fish/cmds.c:2755 fish/cmds.c:2773 fish/cmds.c:2787 fish/cmds.c:2804
-#: fish/cmds.c:2818 fish/cmds.c:2835 fish/cmds.c:2849 fish/cmds.c:2866
-#: fish/cmds.c:2880 fish/cmds.c:2898 fish/cmds.c:2916 fish/cmds.c:2933
-#: fish/cmds.c:2952 fish/cmds.c:2970 fish/cmds.c:2989 fish/cmds.c:3008
-#: fish/cmds.c:3027 fish/cmds.c:3045 fish/cmds.c:3063 fish/cmds.c:3082
-#: fish/cmds.c:3101 fish/cmds.c:3120 fish/cmds.c:3134 fish/cmds.c:3149
-#: fish/cmds.c:3169 fish/cmds.c:3220 fish/cmds.c:3235 fish/cmds.c:3250
-#: fish/cmds.c:3268 fish/cmds.c:3289 fish/cmds.c:3310 fish/cmds.c:3329
-#: fish/cmds.c:3345 fish/cmds.c:3361 fish/cmds.c:3377 fish/cmds.c:3393
-#: fish/cmds.c:3409 fish/cmds.c:3425 fish/cmds.c:3441 fish/cmds.c:3459
-#: fish/cmds.c:3481 fish/cmds.c:3516 fish/cmds.c:3532 fish/cmds.c:3554
-#: fish/cmds.c:3575 fish/cmds.c:3595 fish/cmds.c:3614 fish/cmds.c:3632
-#: fish/cmds.c:3651 fish/cmds.c:3668 fish/cmds.c:3685 fish/cmds.c:3698
-#: fish/cmds.c:3713 fish/cmds.c:3732 fish/cmds.c:3750 fish/cmds.c:3768
-#: fish/cmds.c:3786 fish/cmds.c:3804 fish/cmds.c:3823 fish/cmds.c:3862
-#: fish/cmds.c:3918 fish/cmds.c:3938 fish/cmds.c:3958 fish/cmds.c:3978
-#: fish/cmds.c:3995 fish/cmds.c:4016 fish/cmds.c:4053 fish/cmds.c:4074
-#: fish/cmds.c:4152 fish/cmds.c:4190 fish/cmds.c:4204 fish/cmds.c:4220
-#: fish/cmds.c:4233 fish/cmds.c:4248 fish/cmds.c:4269 fish/cmds.c:4290
-#: fish/cmds.c:4311 fish/cmds.c:4332 fish/cmds.c:4353 fish/cmds.c:4374
-#: fish/cmds.c:4393 fish/cmds.c:4409 fish/cmds.c:4425 fish/cmds.c:4443
-#: fish/cmds.c:4461 fish/cmds.c:4480 fish/cmds.c:4515 fish/cmds.c:4533
-#: fish/cmds.c:4551 fish/cmds.c:4567 fish/cmds.c:4584 fish/cmds.c:4606
-#: fish/cmds.c:4628 fish/cmds.c:4651 fish/cmds.c:4673 fish/cmds.c:4693
-#: fish/cmds.c:4715 fish/cmds.c:4737 fish/cmds.c:4756 fish/cmds.c:4777
-#: fish/cmds.c:4797 fish/cmds.c:4819 fish/cmds.c:4835 fish/cmds.c:4851
-#: fish/cmds.c:4868 fish/cmds.c:4885 fish/cmds.c:4905 fish/cmds.c:4922
-#: fish/cmds.c:4942 fish/cmds.c:4961 fish/cmds.c:4978 fish/cmds.c:4998
-#: fish/cmds.c:5020 fish/cmds.c:5042 fish/cmds.c:5063 fish/cmds.c:5095
-#: fish/cmds.c:5111 fish/cmds.c:5127 fish/cmds.c:5150 fish/cmds.c:5172
-#: fish/cmds.c:5194 fish/cmds.c:5215 fish/cmds.c:5231 fish/cmds.c:5252
-#: fish/cmds.c:5345 fish/cmds.c:5364 fish/cmds.c:5383 fish/cmds.c:5402
-#: fish/cmds.c:5419 fish/cmds.c:5439 fish/cmds.c:5474 fish/cmds.c:5490
-#: fish/cmds.c:5511 fish/cmds.c:5527 fish/cmds.c:5562 fish/cmds.c:5581
-#: fish/cmds.c:5600 fish/cmds.c:5619 fish/cmds.c:5640 fish/cmds.c:5656
-#: fish/cmds.c:5674 fish/cmds.c:5692 fish/cmds.c:5713 fish/cmds.c:5733
-#: fish/cmds.c:5753 fish/cmds.c:5773 fish/cmds.c:5795 fish/cmds.c:5835
-#: fish/cmds.c:5857 fish/cmds.c:5895 fish/cmds.c:5911 fish/cmds.c:5929
-#: fish/cmds.c:5949 fish/cmds.c:5971 fish/cmds.c:5992 fish/cmds.c:6009
-#: fish/cmds.c:6027 fish/cmds.c:6047 fish/cmds.c:6123 fish/cmds.c:6163
-#: fish/cmds.c:6241 fish/cmds.c:6316 fish/cmds.c:6352 fish/cmds.c:6374
-#: fish/cmds.c:6394 fish/cmds.c:6416 fish/cmds.c:6437 fish/cmds.c:6461
-#: fish/cmds.c:6503 fish/cmds.c:6543 fish/cmds.c:6563 fish/cmds.c:6580
-#: fish/cmds.c:6598 fish/cmds.c:6614 fish/cmds.c:6631 fish/cmds.c:6657
-#: fish/cmds.c:6680 fish/cmds.c:6703 fish/cmds.c:6726 fish/cmds.c:6749
-#: fish/cmds.c:6772 fish/cmds.c:6795 fish/cmds.c:6818 fish/cmds.c:6841
-#: fish/cmds.c:6864 fish/cmds.c:6887 fish/cmds.c:6910 fish/cmds.c:6932
-#: fish/cmds.c:6954 fish/cmds.c:6974 fish/cmds.c:6994 fish/cmds.c:7014
-#: fish/cmds.c:7033 fish/cmds.c:7055 fish/cmds.c:7092 fish/cmds.c:7108
-#: fish/cmds.c:7124 fish/cmds.c:7142 fish/cmds.c:7160 fish/cmds.c:7176
-#: fish/cmds.c:7192 fish/cmds.c:7208 fish/cmds.c:7224 fish/cmds.c:7242
-#: fish/cmds.c:7277 fish/cmds.c:7316 fish/cmds.c:7348 fish/cmds.c:7364
-#: fish/cmds.c:7380 fish/cmds.c:7395 fish/cmds.c:7409 fish/cmds.c:7429
-#: fish/cmds.c:7466 fish/cmds.c:7503 fish/cmds.c:7541 fish/cmds.c:7580
-#: fish/cmds.c:7620 fish/cmds.c:7660 fish/cmds.c:7697 fish/cmds.c:7713
-#: fish/cmds.c:7735 fish/cmds.c:7756 fish/cmds.c:7777 fish/cmds.c:7796
-#: fish/cmds.c:7815 fish/cmds.c:7850 fish/cmds.c:7921 fish/cmds.c:7960
-#: fish/cmds.c:8017 fish/cmds.c:8042 fish/cmds.c:8067 fish/cmds.c:8094
-#: fish/cmds.c:8152 fish/cmds.c:8172 fish/cmds.c:8216 fish/cmds.c:8235
-#: fish/cmds.c:8273 fish/cmds.c:8309 fish/cmds.c:8328 fish/cmds.c:8349
-#: fish/cmds.c:8405 fish/cmds.c:8424 fish/cmds.c:8445 fish/cmds.c:8466
-#: fish/cmds.c:8484 fish/cmds.c:8503 fish/cmds.c:8529 fish/cmds.c:8548
-#: fish/cmds.c:8567 fish/cmds.c:8586 fish/cmds.c:8605 fish/cmds.c:8626
-#: fish/cmds.c:8660 fish/cmds.c:8677 fish/cmds.c:8699 fish/cmds.c:8720
-#: fish/cmds.c:8734 fish/cmds.c:8750 fish/cmds.c:8786 fish/cmds.c:8824
-#: fish/cmds.c:8863 fish/cmds.c:8918 fish/cmds.c:8939 fish/cmds.c:8974
-#: fish/cmds.c:8988 fish/cmds.c:9007 fish/cmds.c:9046 fish/cmds.c:9068
-#: fish/cmds.c:9091 fish/cmds.c:9115 fish/cmds.c:9155 fish/cmds.c:9179
-#: fish/cmds.c:9216 fish/cmds.c:9246 fish/cmds.c:9276 fish/cmds.c:9303
-#: fish/cmds.c:9322 fish/cmds.c:9353 fish/cmds.c:9372 fish/cmds.c:9391
-#: fish/cmds.c:9407 fish/cmds.c:9424 fish/cmds.c:9446 fish/cmds.c:9466
-#: fish/cmds.c:9484 fish/cmds.c:9525 fish/cmds.c:9567 fish/cmds.c:9610
-#: fish/cmds.c:9648 fish/cmds.c:9666 fish/cmds.c:9685 fish/cmds.c:9704
-#: fish/cmds.c:9724 fish/cmds.c:9744 fish/cmds.c:9764 fish/cmds.c:9784
-#: fish/cmds.c:9804 fish/cmds.c:9825 fish/cmds.c:9862 fish/cmds.c:9912
-#: fish/cmds.c:9949 fish/cmds.c:10004
+#: fish/cmds.c:3402 fish/cmds.c:3416 fish/cmds.c:3432 fish/cmds.c:3449
+#: fish/cmds.c:3466 fish/cmds.c:3484 fish/cmds.c:3503 fish/cmds.c:3519
+#: fish/cmds.c:3537 fish/cmds.c:3553 fish/cmds.c:3571 fish/cmds.c:3587
+#: fish/cmds.c:3604 fish/cmds.c:3619 fish/cmds.c:3637 fish/cmds.c:3652
+#: fish/cmds.c:3668 fish/cmds.c:3684 fish/cmds.c:3700 fish/cmds.c:3716
+#: fish/cmds.c:3732 fish/cmds.c:3750 fish/cmds.c:3783 fish/cmds.c:3799
+#: fish/cmds.c:3815 fish/cmds.c:3834 fish/cmds.c:3849 fish/cmds.c:3867
+#: fish/cmds.c:3882 fish/cmds.c:3900 fish/cmds.c:3915 fish/cmds.c:3933
+#: fish/cmds.c:3948 fish/cmds.c:3967 fish/cmds.c:3986 fish/cmds.c:4004
+#: fish/cmds.c:4024 fish/cmds.c:4043 fish/cmds.c:4063 fish/cmds.c:4083
+#: fish/cmds.c:4103 fish/cmds.c:4122 fish/cmds.c:4141 fish/cmds.c:4161
+#: fish/cmds.c:4181 fish/cmds.c:4201 fish/cmds.c:4216 fish/cmds.c:4232
+#: fish/cmds.c:4253 fish/cmds.c:4304 fish/cmds.c:4322 fish/cmds.c:4342
+#: fish/cmds.c:4358 fish/cmds.c:4374 fish/cmds.c:4393 fish/cmds.c:4415
+#: fish/cmds.c:4437 fish/cmds.c:4457 fish/cmds.c:4474 fish/cmds.c:4491
+#: fish/cmds.c:4508 fish/cmds.c:4525 fish/cmds.c:4542 fish/cmds.c:4559
+#: fish/cmds.c:4576 fish/cmds.c:4595 fish/cmds.c:4618 fish/cmds.c:4654
+#: fish/cmds.c:4671 fish/cmds.c:4694 fish/cmds.c:4716 fish/cmds.c:4737
+#: fish/cmds.c:4757 fish/cmds.c:4776 fish/cmds.c:4796 fish/cmds.c:4814
+#: fish/cmds.c:4832 fish/cmds.c:4846 fish/cmds.c:4862 fish/cmds.c:4882
+#: fish/cmds.c:4901 fish/cmds.c:4920 fish/cmds.c:4939 fish/cmds.c:4958
+#: fish/cmds.c:4978 fish/cmds.c:5018 fish/cmds.c:5075 fish/cmds.c:5096
+#: fish/cmds.c:5117 fish/cmds.c:5138 fish/cmds.c:5156 fish/cmds.c:5178
+#: fish/cmds.c:5216 fish/cmds.c:5238 fish/cmds.c:5317 fish/cmds.c:5356
+#: fish/cmds.c:5371 fish/cmds.c:5388 fish/cmds.c:5402 fish/cmds.c:5418
+#: fish/cmds.c:5440 fish/cmds.c:5462 fish/cmds.c:5484 fish/cmds.c:5506
+#: fish/cmds.c:5528 fish/cmds.c:5550 fish/cmds.c:5570 fish/cmds.c:5587
+#: fish/cmds.c:5604 fish/cmds.c:5623 fish/cmds.c:5642 fish/cmds.c:5662
+#: fish/cmds.c:5698 fish/cmds.c:5717 fish/cmds.c:5736 fish/cmds.c:5753
+#: fish/cmds.c:5771 fish/cmds.c:5794 fish/cmds.c:5817 fish/cmds.c:5841
+#: fish/cmds.c:5864 fish/cmds.c:5885 fish/cmds.c:5908 fish/cmds.c:5931
+#: fish/cmds.c:5951 fish/cmds.c:5973 fish/cmds.c:5994 fish/cmds.c:6017
+#: fish/cmds.c:6034 fish/cmds.c:6051 fish/cmds.c:6069 fish/cmds.c:6087
+#: fish/cmds.c:6108 fish/cmds.c:6126 fish/cmds.c:6147 fish/cmds.c:6167
+#: fish/cmds.c:6185 fish/cmds.c:6206 fish/cmds.c:6229 fish/cmds.c:6252
+#: fish/cmds.c:6274 fish/cmds.c:6307 fish/cmds.c:6324 fish/cmds.c:6341
+#: fish/cmds.c:6365 fish/cmds.c:6388 fish/cmds.c:6411 fish/cmds.c:6433
+#: fish/cmds.c:6450 fish/cmds.c:6472 fish/cmds.c:6566 fish/cmds.c:6586
+#: fish/cmds.c:6606 fish/cmds.c:6626 fish/cmds.c:6644 fish/cmds.c:6665
+#: fish/cmds.c:6701 fish/cmds.c:6718 fish/cmds.c:6740 fish/cmds.c:6757
+#: fish/cmds.c:6793 fish/cmds.c:6813 fish/cmds.c:6833 fish/cmds.c:6853
+#: fish/cmds.c:6875 fish/cmds.c:6892 fish/cmds.c:6911 fish/cmds.c:6930
+#: fish/cmds.c:6952 fish/cmds.c:6973 fish/cmds.c:6994 fish/cmds.c:7015
+#: fish/cmds.c:7038 fish/cmds.c:7079 fish/cmds.c:7102 fish/cmds.c:7141
+#: fish/cmds.c:7158 fish/cmds.c:7177 fish/cmds.c:7198 fish/cmds.c:7221
+#: fish/cmds.c:7243 fish/cmds.c:7261 fish/cmds.c:7280 fish/cmds.c:7301
+#: fish/cmds.c:7378 fish/cmds.c:7419 fish/cmds.c:7498 fish/cmds.c:7574
+#: fish/cmds.c:7611 fish/cmds.c:7634 fish/cmds.c:7655 fish/cmds.c:7678
+#: fish/cmds.c:7700 fish/cmds.c:7725 fish/cmds.c:7768 fish/cmds.c:7809
+#: fish/cmds.c:7830 fish/cmds.c:7848 fish/cmds.c:7867 fish/cmds.c:7884
+#: fish/cmds.c:7902 fish/cmds.c:7929 fish/cmds.c:7953 fish/cmds.c:7977
+#: fish/cmds.c:8001 fish/cmds.c:8025 fish/cmds.c:8049 fish/cmds.c:8073
+#: fish/cmds.c:8097 fish/cmds.c:8121 fish/cmds.c:8145 fish/cmds.c:8169
+#: fish/cmds.c:8193 fish/cmds.c:8216 fish/cmds.c:8239 fish/cmds.c:8260
+#: fish/cmds.c:8281 fish/cmds.c:8302 fish/cmds.c:8322 fish/cmds.c:8345
+#: fish/cmds.c:8383 fish/cmds.c:8400 fish/cmds.c:8417 fish/cmds.c:8436
+#: fish/cmds.c:8455 fish/cmds.c:8472 fish/cmds.c:8489 fish/cmds.c:8506
+#: fish/cmds.c:8523 fish/cmds.c:8542 fish/cmds.c:8578 fish/cmds.c:8618
+#: fish/cmds.c:8651 fish/cmds.c:8668 fish/cmds.c:8685 fish/cmds.c:8701
+#: fish/cmds.c:8716 fish/cmds.c:8737 fish/cmds.c:8775 fish/cmds.c:8813
+#: fish/cmds.c:8852 fish/cmds.c:8892 fish/cmds.c:8933 fish/cmds.c:8974
+#: fish/cmds.c:9012 fish/cmds.c:9029 fish/cmds.c:9052 fish/cmds.c:9074
+#: fish/cmds.c:9096 fish/cmds.c:9116 fish/cmds.c:9136 fish/cmds.c:9172
+#: fish/cmds.c:9244 fish/cmds.c:9284 fish/cmds.c:9342 fish/cmds.c:9368
+#: fish/cmds.c:9394 fish/cmds.c:9422 fish/cmds.c:9481 fish/cmds.c:9502
+#: fish/cmds.c:9547 fish/cmds.c:9567 fish/cmds.c:9606 fish/cmds.c:9643
+#: fish/cmds.c:9663 fish/cmds.c:9685 fish/cmds.c:9742 fish/cmds.c:9762
+#: fish/cmds.c:9784 fish/cmds.c:9806 fish/cmds.c:9825 fish/cmds.c:9845
+#: fish/cmds.c:9872 fish/cmds.c:9892 fish/cmds.c:9912 fish/cmds.c:9932
+#: fish/cmds.c:9952 fish/cmds.c:9974 fish/cmds.c:10009 fish/cmds.c:10027
+#: fish/cmds.c:10050 fish/cmds.c:10072 fish/cmds.c:10087 fish/cmds.c:10104
+#: fish/cmds.c:10141 fish/cmds.c:10180 fish/cmds.c:10220 fish/cmds.c:10276
+#: fish/cmds.c:10298 fish/cmds.c:10334 fish/cmds.c:10349 fish/cmds.c:10369
+#: fish/cmds.c:10409 fish/cmds.c:10432 fish/cmds.c:10456 fish/cmds.c:10481
+#: fish/cmds.c:10522 fish/cmds.c:10547 fish/cmds.c:10585 fish/cmds.c:10616
+#: fish/cmds.c:10647 fish/cmds.c:10675 fish/cmds.c:10695 fish/cmds.c:10727
+#: fish/cmds.c:10747 fish/cmds.c:10767 fish/cmds.c:10784 fish/cmds.c:10802
+#: fish/cmds.c:10825 fish/cmds.c:10846 fish/cmds.c:10865 fish/cmds.c:10907
+#: fish/cmds.c:10950 fish/cmds.c:10994 fish/cmds.c:11033 fish/cmds.c:11052
+#: fish/cmds.c:11072 fish/cmds.c:11092 fish/cmds.c:11113 fish/cmds.c:11134
+#: fish/cmds.c:11155 fish/cmds.c:11176 fish/cmds.c:11197 fish/cmds.c:11219
+#: fish/cmds.c:11257 fish/cmds.c:11308 fish/cmds.c:11346 fish/cmds.c:11402