-#: fish/cmds.c:2360 fish/cmds.c:2373 fish/cmds.c:2388 fish/cmds.c:2404
-#: fish/cmds.c:2420 fish/cmds.c:2437 fish/cmds.c:2455 fish/cmds.c:2470
-#: fish/cmds.c:2487 fish/cmds.c:2502 fish/cmds.c:2519 fish/cmds.c:2534
-#: fish/cmds.c:2550 fish/cmds.c:2564 fish/cmds.c:2581 fish/cmds.c:2595
-#: fish/cmds.c:2610 fish/cmds.c:2625 fish/cmds.c:2640 fish/cmds.c:2655
-#: fish/cmds.c:2670 fish/cmds.c:2687 fish/cmds.c:2719 fish/cmds.c:2734
-#: fish/cmds.c:2749 fish/cmds.c:2767 fish/cmds.c:2781 fish/cmds.c:2798
-#: fish/cmds.c:2812 fish/cmds.c:2829 fish/cmds.c:2843 fish/cmds.c:2860
-#: fish/cmds.c:2874 fish/cmds.c:2892 fish/cmds.c:2910 fish/cmds.c:2927
-#: fish/cmds.c:2946 fish/cmds.c:2964 fish/cmds.c:2983 fish/cmds.c:3002
-#: fish/cmds.c:3021 fish/cmds.c:3039 fish/cmds.c:3057 fish/cmds.c:3076
-#: fish/cmds.c:3095 fish/cmds.c:3114 fish/cmds.c:3128 fish/cmds.c:3143
-#: fish/cmds.c:3163 fish/cmds.c:3207 fish/cmds.c:3222 fish/cmds.c:3237
-#: fish/cmds.c:3255 fish/cmds.c:3276 fish/cmds.c:3297 fish/cmds.c:3316
-#: fish/cmds.c:3332 fish/cmds.c:3348 fish/cmds.c:3364 fish/cmds.c:3380
-#: fish/cmds.c:3396 fish/cmds.c:3412 fish/cmds.c:3428 fish/cmds.c:3446
-#: fish/cmds.c:3468 fish/cmds.c:3503 fish/cmds.c:3519 fish/cmds.c:3541
-#: fish/cmds.c:3562 fish/cmds.c:3582 fish/cmds.c:3601 fish/cmds.c:3619
-#: fish/cmds.c:3638 fish/cmds.c:3655 fish/cmds.c:3672 fish/cmds.c:3685
-#: fish/cmds.c:3700 fish/cmds.c:3719 fish/cmds.c:3737 fish/cmds.c:3755
-#: fish/cmds.c:3773 fish/cmds.c:3791 fish/cmds.c:3810 fish/cmds.c:3849
-#: fish/cmds.c:3905 fish/cmds.c:3925 fish/cmds.c:3945 fish/cmds.c:3965
-#: fish/cmds.c:3982 fish/cmds.c:4003 fish/cmds.c:4040 fish/cmds.c:4061
-#: fish/cmds.c:4139 fish/cmds.c:4177 fish/cmds.c:4191 fish/cmds.c:4207
-#: fish/cmds.c:4220 fish/cmds.c:4235 fish/cmds.c:4256 fish/cmds.c:4277
-#: fish/cmds.c:4298 fish/cmds.c:4319 fish/cmds.c:4340 fish/cmds.c:4361
-#: fish/cmds.c:4380 fish/cmds.c:4396 fish/cmds.c:4412 fish/cmds.c:4430
-#: fish/cmds.c:4448 fish/cmds.c:4467 fish/cmds.c:4502 fish/cmds.c:4520
-#: fish/cmds.c:4538 fish/cmds.c:4554 fish/cmds.c:4571 fish/cmds.c:4593
-#: fish/cmds.c:4615 fish/cmds.c:4638 fish/cmds.c:4660 fish/cmds.c:4680
-#: fish/cmds.c:4702 fish/cmds.c:4724 fish/cmds.c:4743 fish/cmds.c:4764
-#: fish/cmds.c:4784 fish/cmds.c:4806 fish/cmds.c:4822 fish/cmds.c:4838
-#: fish/cmds.c:4855 fish/cmds.c:4872 fish/cmds.c:4892 fish/cmds.c:4909
-#: fish/cmds.c:4929 fish/cmds.c:4948 fish/cmds.c:4965 fish/cmds.c:4985
-#: fish/cmds.c:5007 fish/cmds.c:5029 fish/cmds.c:5050 fish/cmds.c:5082
-#: fish/cmds.c:5098 fish/cmds.c:5114 fish/cmds.c:5137 fish/cmds.c:5159
-#: fish/cmds.c:5181 fish/cmds.c:5202 fish/cmds.c:5218 fish/cmds.c:5239
-#: fish/cmds.c:5332 fish/cmds.c:5351 fish/cmds.c:5370 fish/cmds.c:5389
-#: fish/cmds.c:5406 fish/cmds.c:5426 fish/cmds.c:5461 fish/cmds.c:5477
-#: fish/cmds.c:5498 fish/cmds.c:5514 fish/cmds.c:5549 fish/cmds.c:5568
-#: fish/cmds.c:5587 fish/cmds.c:5606 fish/cmds.c:5627 fish/cmds.c:5643
-#: fish/cmds.c:5661 fish/cmds.c:5679 fish/cmds.c:5700 fish/cmds.c:5720
-#: fish/cmds.c:5740 fish/cmds.c:5760 fish/cmds.c:5782 fish/cmds.c:5822
-#: fish/cmds.c:5844 fish/cmds.c:5882 fish/cmds.c:5898 fish/cmds.c:5916
-#: fish/cmds.c:5936 fish/cmds.c:5958 fish/cmds.c:5979 fish/cmds.c:5996
-#: fish/cmds.c:6014 fish/cmds.c:6034 fish/cmds.c:6110 fish/cmds.c:6150
-#: fish/cmds.c:6228 fish/cmds.c:6303 fish/cmds.c:6339 fish/cmds.c:6361
-#: fish/cmds.c:6381 fish/cmds.c:6403 fish/cmds.c:6424 fish/cmds.c:6448
-#: fish/cmds.c:6490 fish/cmds.c:6530 fish/cmds.c:6550 fish/cmds.c:6567
-#: fish/cmds.c:6585 fish/cmds.c:6601 fish/cmds.c:6618 fish/cmds.c:6644
-#: fish/cmds.c:6667 fish/cmds.c:6690 fish/cmds.c:6713 fish/cmds.c:6736
-#: fish/cmds.c:6759 fish/cmds.c:6782 fish/cmds.c:6805 fish/cmds.c:6828
-#: fish/cmds.c:6851 fish/cmds.c:6874 fish/cmds.c:6897 fish/cmds.c:6919
-#: fish/cmds.c:6941 fish/cmds.c:6961 fish/cmds.c:6981 fish/cmds.c:7001
-#: fish/cmds.c:7020 fish/cmds.c:7042 fish/cmds.c:7079 fish/cmds.c:7095
-#: fish/cmds.c:7111 fish/cmds.c:7129 fish/cmds.c:7147 fish/cmds.c:7163
-#: fish/cmds.c:7179 fish/cmds.c:7195 fish/cmds.c:7211 fish/cmds.c:7229
-#: fish/cmds.c:7264 fish/cmds.c:7303 fish/cmds.c:7335 fish/cmds.c:7351
-#: fish/cmds.c:7367 fish/cmds.c:7382 fish/cmds.c:7396 fish/cmds.c:7416
-#: fish/cmds.c:7453 fish/cmds.c:7490 fish/cmds.c:7528 fish/cmds.c:7567
-#: fish/cmds.c:7607 fish/cmds.c:7647 fish/cmds.c:7684 fish/cmds.c:7700
-#: fish/cmds.c:7722 fish/cmds.c:7743 fish/cmds.c:7764 fish/cmds.c:7783
-#: fish/cmds.c:7802 fish/cmds.c:7837 fish/cmds.c:7908 fish/cmds.c:7947
-#: fish/cmds.c:8004 fish/cmds.c:8029 fish/cmds.c:8054 fish/cmds.c:8081
-#: fish/cmds.c:8139 fish/cmds.c:8159 fish/cmds.c:8203 fish/cmds.c:8222
-#: fish/cmds.c:8260 fish/cmds.c:8296 fish/cmds.c:8315 fish/cmds.c:8336
-#: fish/cmds.c:8392 fish/cmds.c:8411 fish/cmds.c:8432 fish/cmds.c:8453
-#: fish/cmds.c:8471 fish/cmds.c:8490 fish/cmds.c:8516 fish/cmds.c:8535
-#: fish/cmds.c:8554 fish/cmds.c:8573 fish/cmds.c:8592 fish/cmds.c:8613
-#: fish/cmds.c:8647 fish/cmds.c:8664 fish/cmds.c:8686 fish/cmds.c:8707
-#: fish/cmds.c:8721 fish/cmds.c:8737 fish/cmds.c:8773 fish/cmds.c:8811
-#: fish/cmds.c:8850 fish/cmds.c:8905 fish/cmds.c:8926 fish/cmds.c:8961
-#: fish/cmds.c:8975 fish/cmds.c:8994 fish/cmds.c:9033 fish/cmds.c:9055
-#: fish/cmds.c:9078 fish/cmds.c:9102 fish/cmds.c:9142 fish/cmds.c:9166
-#: fish/cmds.c:9203 fish/cmds.c:9233 fish/cmds.c:9263 fish/cmds.c:9290
-#: fish/cmds.c:9309 fish/cmds.c:9340 fish/cmds.c:9359 fish/cmds.c:9378
-#: fish/cmds.c:9394 fish/cmds.c:9411 fish/cmds.c:9433 fish/cmds.c:9453
-#: fish/cmds.c:9471 fish/cmds.c:9512 fish/cmds.c:9554 fish/cmds.c:9597
-#: fish/cmds.c:9635 fish/cmds.c:9653 fish/cmds.c:9672 fish/cmds.c:9691
-#: fish/cmds.c:9711 fish/cmds.c:9731 fish/cmds.c:9751 fish/cmds.c:9771
-#: fish/cmds.c:9791 fish/cmds.c:9812 fish/cmds.c:9849 fish/cmds.c:9899
-#: fish/cmds.c:9936
+#: 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