-#: 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:3483 fish/cmds.c:3497 fish/cmds.c:3513 fish/cmds.c:3530
+#: fish/cmds.c:3547 fish/cmds.c:3565 fish/cmds.c:3584 fish/cmds.c:3600
+#: fish/cmds.c:3618 fish/cmds.c:3634 fish/cmds.c:3652 fish/cmds.c:3668
+#: fish/cmds.c:3685 fish/cmds.c:3700 fish/cmds.c:3718 fish/cmds.c:3733
+#: fish/cmds.c:3749 fish/cmds.c:3765 fish/cmds.c:3781 fish/cmds.c:3797
+#: fish/cmds.c:3813 fish/cmds.c:3831 fish/cmds.c:3864 fish/cmds.c:3880
+#: fish/cmds.c:3896 fish/cmds.c:3915 fish/cmds.c:3930 fish/cmds.c:3948
+#: fish/cmds.c:3963 fish/cmds.c:3981 fish/cmds.c:3996 fish/cmds.c:4014
+#: fish/cmds.c:4029 fish/cmds.c:4048 fish/cmds.c:4067 fish/cmds.c:4085
+#: fish/cmds.c:4105 fish/cmds.c:4124 fish/cmds.c:4144 fish/cmds.c:4164
+#: fish/cmds.c:4184 fish/cmds.c:4203 fish/cmds.c:4222 fish/cmds.c:4242
+#: fish/cmds.c:4262 fish/cmds.c:4282 fish/cmds.c:4297 fish/cmds.c:4313
+#: fish/cmds.c:4334 fish/cmds.c:4385 fish/cmds.c:4403 fish/cmds.c:4420
+#: fish/cmds.c:4441 fish/cmds.c:4494 fish/cmds.c:4514 fish/cmds.c:4534
+#: fish/cmds.c:4554 fish/cmds.c:4575 fish/cmds.c:4591 fish/cmds.c:4607
+#: fish/cmds.c:4626 fish/cmds.c:4648 fish/cmds.c:4670 fish/cmds.c:4690
+#: fish/cmds.c:4707 fish/cmds.c:4724 fish/cmds.c:4741 fish/cmds.c:4758
+#: fish/cmds.c:4775 fish/cmds.c:4792 fish/cmds.c:4809 fish/cmds.c:4828
+#: fish/cmds.c:4851 fish/cmds.c:4887 fish/cmds.c:4904 fish/cmds.c:4927
+#: fish/cmds.c:4949 fish/cmds.c:4970 fish/cmds.c:4990 fish/cmds.c:5009
+#: fish/cmds.c:5029 fish/cmds.c:5047 fish/cmds.c:5065 fish/cmds.c:5079
+#: fish/cmds.c:5095 fish/cmds.c:5115 fish/cmds.c:5134 fish/cmds.c:5153
+#: fish/cmds.c:5172 fish/cmds.c:5191 fish/cmds.c:5211 fish/cmds.c:5251
+#: fish/cmds.c:5308 fish/cmds.c:5329 fish/cmds.c:5350 fish/cmds.c:5371
+#: fish/cmds.c:5389 fish/cmds.c:5411 fish/cmds.c:5449 fish/cmds.c:5471
+#: fish/cmds.c:5550 fish/cmds.c:5589 fish/cmds.c:5604 fish/cmds.c:5621
+#: fish/cmds.c:5635 fish/cmds.c:5651 fish/cmds.c:5673 fish/cmds.c:5695
+#: fish/cmds.c:5717 fish/cmds.c:5739 fish/cmds.c:5761 fish/cmds.c:5783
+#: fish/cmds.c:5803 fish/cmds.c:5820 fish/cmds.c:5837 fish/cmds.c:5856
+#: fish/cmds.c:5875 fish/cmds.c:5895 fish/cmds.c:5931 fish/cmds.c:5950
+#: fish/cmds.c:5969 fish/cmds.c:5986 fish/cmds.c:6004 fish/cmds.c:6027
+#: fish/cmds.c:6050 fish/cmds.c:6074 fish/cmds.c:6097 fish/cmds.c:6118
+#: fish/cmds.c:6141 fish/cmds.c:6164 fish/cmds.c:6184 fish/cmds.c:6206
+#: fish/cmds.c:6227 fish/cmds.c:6250 fish/cmds.c:6267 fish/cmds.c:6284
+#: fish/cmds.c:6302 fish/cmds.c:6320 fish/cmds.c:6341 fish/cmds.c:6359
+#: fish/cmds.c:6380 fish/cmds.c:6400 fish/cmds.c:6418 fish/cmds.c:6439
+#: fish/cmds.c:6462 fish/cmds.c:6485 fish/cmds.c:6507 fish/cmds.c:6540
+#: fish/cmds.c:6557 fish/cmds.c:6574 fish/cmds.c:6598 fish/cmds.c:6621
+#: fish/cmds.c:6644 fish/cmds.c:6666 fish/cmds.c:6683 fish/cmds.c:6705
+#: fish/cmds.c:6799 fish/cmds.c:6819 fish/cmds.c:6839 fish/cmds.c:6859
+#: fish/cmds.c:6877 fish/cmds.c:6898 fish/cmds.c:6934 fish/cmds.c:6951
+#: fish/cmds.c:6973 fish/cmds.c:6990 fish/cmds.c:7026 fish/cmds.c:7046
+#: fish/cmds.c:7066 fish/cmds.c:7086 fish/cmds.c:7108 fish/cmds.c:7125
+#: fish/cmds.c:7144 fish/cmds.c:7163 fish/cmds.c:7185 fish/cmds.c:7206
+#: fish/cmds.c:7227 fish/cmds.c:7248 fish/cmds.c:7271 fish/cmds.c:7312
+#: fish/cmds.c:7335 fish/cmds.c:7374 fish/cmds.c:7391 fish/cmds.c:7410
+#: fish/cmds.c:7431 fish/cmds.c:7454 fish/cmds.c:7476 fish/cmds.c:7494
+#: fish/cmds.c:7513 fish/cmds.c:7534 fish/cmds.c:7611 fish/cmds.c:7652
+#: fish/cmds.c:7731 fish/cmds.c:7807 fish/cmds.c:7844 fish/cmds.c:7867
+#: fish/cmds.c:7888 fish/cmds.c:7911 fish/cmds.c:7933 fish/cmds.c:7958
+#: fish/cmds.c:8001 fish/cmds.c:8042 fish/cmds.c:8063 fish/cmds.c:8081
+#: fish/cmds.c:8100 fish/cmds.c:8117 fish/cmds.c:8135 fish/cmds.c:8162
+#: fish/cmds.c:8186 fish/cmds.c:8210 fish/cmds.c:8234 fish/cmds.c:8258
+#: fish/cmds.c:8282 fish/cmds.c:8306 fish/cmds.c:8330 fish/cmds.c:8354
+#: fish/cmds.c:8378 fish/cmds.c:8402 fish/cmds.c:8426 fish/cmds.c:8449
+#: fish/cmds.c:8472 fish/cmds.c:8493 fish/cmds.c:8514 fish/cmds.c:8535
+#: fish/cmds.c:8555 fish/cmds.c:8578 fish/cmds.c:8616 fish/cmds.c:8633
+#: fish/cmds.c:8650 fish/cmds.c:8669 fish/cmds.c:8688 fish/cmds.c:8705
+#: fish/cmds.c:8722 fish/cmds.c:8739 fish/cmds.c:8756 fish/cmds.c:8775
+#: fish/cmds.c:8811 fish/cmds.c:8851 fish/cmds.c:8884 fish/cmds.c:8901
+#: fish/cmds.c:8918 fish/cmds.c:8934 fish/cmds.c:8949 fish/cmds.c:8970
+#: fish/cmds.c:9008 fish/cmds.c:9046 fish/cmds.c:9085 fish/cmds.c:9125
+#: fish/cmds.c:9166 fish/cmds.c:9207 fish/cmds.c:9245 fish/cmds.c:9262
+#: fish/cmds.c:9285 fish/cmds.c:9307 fish/cmds.c:9329 fish/cmds.c:9349
+#: fish/cmds.c:9369 fish/cmds.c:9405 fish/cmds.c:9477 fish/cmds.c:9517
+#: fish/cmds.c:9575 fish/cmds.c:9601 fish/cmds.c:9627 fish/cmds.c:9655
+#: fish/cmds.c:9714 fish/cmds.c:9735 fish/cmds.c:9780 fish/cmds.c:9800
+#: fish/cmds.c:9839 fish/cmds.c:9876 fish/cmds.c:9896 fish/cmds.c:9918
+#: fish/cmds.c:9975 fish/cmds.c:9995 fish/cmds.c:10017 fish/cmds.c:10039
+#: fish/cmds.c:10058 fish/cmds.c:10078 fish/cmds.c:10105 fish/cmds.c:10125
+#: fish/cmds.c:10145 fish/cmds.c:10165 fish/cmds.c:10185 fish/cmds.c:10207
+#: fish/cmds.c:10242 fish/cmds.c:10260 fish/cmds.c:10283 fish/cmds.c:10305
+#: fish/cmds.c:10320 fish/cmds.c:10337 fish/cmds.c:10374 fish/cmds.c:10413
+#: fish/cmds.c:10453 fish/cmds.c:10509 fish/cmds.c:10531 fish/cmds.c:10567
+#: fish/cmds.c:10582 fish/cmds.c:10602 fish/cmds.c:10642 fish/cmds.c:10665
+#: fish/cmds.c:10689 fish/cmds.c:10714 fish/cmds.c:10755 fish/cmds.c:10780
+#: fish/cmds.c:10818 fish/cmds.c:10849 fish/cmds.c:10880 fish/cmds.c:10908
+#: fish/cmds.c:10928 fish/cmds.c:10960 fish/cmds.c:10980 fish/cmds.c:11000
+#: fish/cmds.c:11017 fish/cmds.c:11035 fish/cmds.c:11058 fish/cmds.c:11079
+#: fish/cmds.c:11098 fish/cmds.c:11140 fish/cmds.c:11183 fish/cmds.c:11227
+#: fish/cmds.c:11266 fish/cmds.c:11285 fish/cmds.c:11305 fish/cmds.c:11325
+#: fish/cmds.c:11346 fish/cmds.c:11367 fish/cmds.c:11388 fish/cmds.c:11409
+#: fish/cmds.c:11430 fish/cmds.c:11452 fish/cmds.c:11490 fish/cmds.c:11541
+#: fish/cmds.c:11579 fish/cmds.c:11635