-#: 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:3393 fish/cmds.c:3407 fish/cmds.c:3423 fish/cmds.c:3440
+#: fish/cmds.c:3457 fish/cmds.c:3475 fish/cmds.c:3494 fish/cmds.c:3510
+#: fish/cmds.c:3528 fish/cmds.c:3544 fish/cmds.c:3562 fish/cmds.c:3578
+#: fish/cmds.c:3595 fish/cmds.c:3610 fish/cmds.c:3628 fish/cmds.c:3643
+#: fish/cmds.c:3659 fish/cmds.c:3675 fish/cmds.c:3691 fish/cmds.c:3707
+#: fish/cmds.c:3723 fish/cmds.c:3741 fish/cmds.c:3774 fish/cmds.c:3790
+#: fish/cmds.c:3806 fish/cmds.c:3825 fish/cmds.c:3840 fish/cmds.c:3858
+#: fish/cmds.c:3873 fish/cmds.c:3891 fish/cmds.c:3906 fish/cmds.c:3924
+#: fish/cmds.c:3939 fish/cmds.c:3958 fish/cmds.c:3977 fish/cmds.c:3995
+#: fish/cmds.c:4015 fish/cmds.c:4034 fish/cmds.c:4054 fish/cmds.c:4074
+#: fish/cmds.c:4094 fish/cmds.c:4113 fish/cmds.c:4132 fish/cmds.c:4152
+#: fish/cmds.c:4172 fish/cmds.c:4192 fish/cmds.c:4207 fish/cmds.c:4223
+#: fish/cmds.c:4244 fish/cmds.c:4295 fish/cmds.c:4316 fish/cmds.c:4332
+#: fish/cmds.c:4348 fish/cmds.c:4367 fish/cmds.c:4389 fish/cmds.c:4411
+#: fish/cmds.c:4431 fish/cmds.c:4448 fish/cmds.c:4465 fish/cmds.c:4482
+#: fish/cmds.c:4499 fish/cmds.c:4516 fish/cmds.c:4533 fish/cmds.c:4550
+#: fish/cmds.c:4569 fish/cmds.c:4592 fish/cmds.c:4628 fish/cmds.c:4645
+#: fish/cmds.c:4668 fish/cmds.c:4690 fish/cmds.c:4711 fish/cmds.c:4731
+#: fish/cmds.c:4750 fish/cmds.c:4770 fish/cmds.c:4788 fish/cmds.c:4806
+#: fish/cmds.c:4820 fish/cmds.c:4836 fish/cmds.c:4856 fish/cmds.c:4875
+#: fish/cmds.c:4894 fish/cmds.c:4913 fish/cmds.c:4932 fish/cmds.c:4952
+#: fish/cmds.c:4992 fish/cmds.c:5049 fish/cmds.c:5070 fish/cmds.c:5091
+#: fish/cmds.c:5112 fish/cmds.c:5130 fish/cmds.c:5152 fish/cmds.c:5190
+#: fish/cmds.c:5212 fish/cmds.c:5291 fish/cmds.c:5330 fish/cmds.c:5345
+#: fish/cmds.c:5362 fish/cmds.c:5376 fish/cmds.c:5392 fish/cmds.c:5414
+#: fish/cmds.c:5436 fish/cmds.c:5458 fish/cmds.c:5480 fish/cmds.c:5502
+#: fish/cmds.c:5524 fish/cmds.c:5544 fish/cmds.c:5561 fish/cmds.c:5578
+#: fish/cmds.c:5597 fish/cmds.c:5616 fish/cmds.c:5636 fish/cmds.c:5672
+#: fish/cmds.c:5691 fish/cmds.c:5710 fish/cmds.c:5727 fish/cmds.c:5745
+#: fish/cmds.c:5768 fish/cmds.c:5791 fish/cmds.c:5815 fish/cmds.c:5838
+#: fish/cmds.c:5859 fish/cmds.c:5882 fish/cmds.c:5905 fish/cmds.c:5925
+#: fish/cmds.c:5947 fish/cmds.c:5968 fish/cmds.c:5991 fish/cmds.c:6008
+#: fish/cmds.c:6025 fish/cmds.c:6043 fish/cmds.c:6061 fish/cmds.c:6082
+#: fish/cmds.c:6100 fish/cmds.c:6121 fish/cmds.c:6141 fish/cmds.c:6159
+#: fish/cmds.c:6180 fish/cmds.c:6203 fish/cmds.c:6226 fish/cmds.c:6248
+#: fish/cmds.c:6281 fish/cmds.c:6298 fish/cmds.c:6315 fish/cmds.c:6339
+#: fish/cmds.c:6362 fish/cmds.c:6385 fish/cmds.c:6407 fish/cmds.c:6424
+#: fish/cmds.c:6446 fish/cmds.c:6540 fish/cmds.c:6560 fish/cmds.c:6580
+#: fish/cmds.c:6600 fish/cmds.c:6618 fish/cmds.c:6639 fish/cmds.c:6675
+#: fish/cmds.c:6692 fish/cmds.c:6714 fish/cmds.c:6731 fish/cmds.c:6767
+#: fish/cmds.c:6787 fish/cmds.c:6807 fish/cmds.c:6827 fish/cmds.c:6849
+#: fish/cmds.c:6866 fish/cmds.c:6885 fish/cmds.c:6904 fish/cmds.c:6926
+#: fish/cmds.c:6947 fish/cmds.c:6968 fish/cmds.c:6989 fish/cmds.c:7012
+#: fish/cmds.c:7053 fish/cmds.c:7076 fish/cmds.c:7115 fish/cmds.c:7132
+#: fish/cmds.c:7151 fish/cmds.c:7172 fish/cmds.c:7195 fish/cmds.c:7217
+#: fish/cmds.c:7235 fish/cmds.c:7254 fish/cmds.c:7275 fish/cmds.c:7352
+#: fish/cmds.c:7393 fish/cmds.c:7472 fish/cmds.c:7548 fish/cmds.c:7585
+#: fish/cmds.c:7608 fish/cmds.c:7629 fish/cmds.c:7652 fish/cmds.c:7674
+#: fish/cmds.c:7699 fish/cmds.c:7742 fish/cmds.c:7783 fish/cmds.c:7804
+#: fish/cmds.c:7822 fish/cmds.c:7841 fish/cmds.c:7858 fish/cmds.c:7876
+#: fish/cmds.c:7903 fish/cmds.c:7927 fish/cmds.c:7951 fish/cmds.c:7975
+#: fish/cmds.c:7999 fish/cmds.c:8023 fish/cmds.c:8047 fish/cmds.c:8071
+#: fish/cmds.c:8095 fish/cmds.c:8119 fish/cmds.c:8143 fish/cmds.c:8167
+#: fish/cmds.c:8190 fish/cmds.c:8213 fish/cmds.c:8234 fish/cmds.c:8255
+#: fish/cmds.c:8276 fish/cmds.c:8296 fish/cmds.c:8319 fish/cmds.c:8357
+#: fish/cmds.c:8374 fish/cmds.c:8391 fish/cmds.c:8410 fish/cmds.c:8429
+#: fish/cmds.c:8446 fish/cmds.c:8463 fish/cmds.c:8480 fish/cmds.c:8497
+#: fish/cmds.c:8516 fish/cmds.c:8552 fish/cmds.c:8592 fish/cmds.c:8625
+#: fish/cmds.c:8642 fish/cmds.c:8659 fish/cmds.c:8675 fish/cmds.c:8690
+#: fish/cmds.c:8711 fish/cmds.c:8749 fish/cmds.c:8787 fish/cmds.c:8826
+#: fish/cmds.c:8866 fish/cmds.c:8907 fish/cmds.c:8948 fish/cmds.c:8986
+#: fish/cmds.c:9003 fish/cmds.c:9026 fish/cmds.c:9048 fish/cmds.c:9070
+#: fish/cmds.c:9090 fish/cmds.c:9110 fish/cmds.c:9146 fish/cmds.c:9218
+#: fish/cmds.c:9258 fish/cmds.c:9316 fish/cmds.c:9342 fish/cmds.c:9368
+#: fish/cmds.c:9396 fish/cmds.c:9455 fish/cmds.c:9476 fish/cmds.c:9521
+#: fish/cmds.c:9541 fish/cmds.c:9580 fish/cmds.c:9617 fish/cmds.c:9637
+#: fish/cmds.c:9659 fish/cmds.c:9716 fish/cmds.c:9736 fish/cmds.c:9758
+#: fish/cmds.c:9780 fish/cmds.c:9799 fish/cmds.c:9819 fish/cmds.c:9846
+#: fish/cmds.c:9866 fish/cmds.c:9886 fish/cmds.c:9906 fish/cmds.c:9926
+#: fish/cmds.c:9948 fish/cmds.c:9983 fish/cmds.c:10001 fish/cmds.c:10024
+#: fish/cmds.c:10046 fish/cmds.c:10061 fish/cmds.c:10078 fish/cmds.c:10115
+#: fish/cmds.c:10154 fish/cmds.c:10194 fish/cmds.c:10250 fish/cmds.c:10272
+#: fish/cmds.c:10308 fish/cmds.c:10323 fish/cmds.c:10343 fish/cmds.c:10383
+#: fish/cmds.c:10406 fish/cmds.c:10430 fish/cmds.c:10455 fish/cmds.c:10496
+#: fish/cmds.c:10521 fish/cmds.c:10559 fish/cmds.c:10590 fish/cmds.c:10621
+#: fish/cmds.c:10649 fish/cmds.c:10669 fish/cmds.c:10701 fish/cmds.c:10721
+#: fish/cmds.c:10741 fish/cmds.c:10758 fish/cmds.c:10776 fish/cmds.c:10799
+#: fish/cmds.c:10820 fish/cmds.c:10839 fish/cmds.c:10881 fish/cmds.c:10924
+#: fish/cmds.c:10968 fish/cmds.c:11007 fish/cmds.c:11026 fish/cmds.c:11046
+#: fish/cmds.c:11066 fish/cmds.c:11087 fish/cmds.c:11108 fish/cmds.c:11129
+#: fish/cmds.c:11150 fish/cmds.c:11171 fish/cmds.c:11193 fish/cmds.c:11231
+#: fish/cmds.c:11282 fish/cmds.c:11320 fish/cmds.c:11376