-#: 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: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