-#: fish/cmds.c:2245 fish/cmds.c:2257 fish/cmds.c:2270 fish/cmds.c:2285
-#: fish/cmds.c:2300 fish/cmds.c:2316 fish/cmds.c:2333 fish/cmds.c:2348
-#: fish/cmds.c:2363 fish/cmds.c:2378 fish/cmds.c:2393 fish/cmds.c:2408
-#: fish/cmds.c:2422 fish/cmds.c:2436 fish/cmds.c:2451 fish/cmds.c:2465
-#: fish/cmds.c:2479 fish/cmds.c:2493 fish/cmds.c:2507 fish/cmds.c:2521
-#: fish/cmds.c:2535 fish/cmds.c:2550 fish/cmds.c:2582 fish/cmds.c:2596
-#: fish/cmds.c:2610 fish/cmds.c:2626 fish/cmds.c:2640 fish/cmds.c:2655
-#: fish/cmds.c:2669 fish/cmds.c:2684 fish/cmds.c:2698 fish/cmds.c:2713
-#: fish/cmds.c:2727 fish/cmds.c:2743 fish/cmds.c:2760 fish/cmds.c:2776
-#: fish/cmds.c:2795 fish/cmds.c:2811 fish/cmds.c:2829 fish/cmds.c:2847
-#: fish/cmds.c:2865 fish/cmds.c:2882 fish/cmds.c:2899 fish/cmds.c:2917
-#: fish/cmds.c:2935 fish/cmds.c:2953 fish/cmds.c:2967 fish/cmds.c:2981
-#: fish/cmds.c:2998 fish/cmds.c:3013 fish/cmds.c:3026 fish/cmds.c:3043
-#: fish/cmds.c:3063 fish/cmds.c:3083 fish/cmds.c:3102 fish/cmds.c:3117
-#: fish/cmds.c:3132 fish/cmds.c:3147 fish/cmds.c:3162 fish/cmds.c:3177
-#: fish/cmds.c:3192 fish/cmds.c:3207 fish/cmds.c:3223 fish/cmds.c:3244
-#: fish/cmds.c:3279 fish/cmds.c:3293 fish/cmds.c:3314 fish/cmds.c:3334
-#: fish/cmds.c:3353 fish/cmds.c:3371 fish/cmds.c:3388 fish/cmds.c:3406
-#: fish/cmds.c:3422 fish/cmds.c:3439 fish/cmds.c:3451 fish/cmds.c:3464
-#: fish/cmds.c:3482 fish/cmds.c:3499 fish/cmds.c:3516 fish/cmds.c:3533
-#: fish/cmds.c:3550 fish/cmds.c:3568 fish/cmds.c:3606 fish/cmds.c:3661
-#: fish/cmds.c:3680 fish/cmds.c:3699 fish/cmds.c:3718 fish/cmds.c:3734
-#: fish/cmds.c:3754 fish/cmds.c:3790 fish/cmds.c:3810 fish/cmds.c:3887
-#: fish/cmds.c:3924 fish/cmds.c:3938 fish/cmds.c:3953 fish/cmds.c:3965
-#: fish/cmds.c:3978 fish/cmds.c:3998 fish/cmds.c:4018 fish/cmds.c:4038
-#: fish/cmds.c:4058 fish/cmds.c:4078 fish/cmds.c:4098 fish/cmds.c:4116
-#: fish/cmds.c:4131 fish/cmds.c:4146 fish/cmds.c:4163 fish/cmds.c:4180
-#: fish/cmds.c:4198 fish/cmds.c:4232 fish/cmds.c:4249 fish/cmds.c:4266
-#: fish/cmds.c:4281 fish/cmds.c:4297 fish/cmds.c:4318 fish/cmds.c:4339
-#: fish/cmds.c:4361 fish/cmds.c:4382 fish/cmds.c:4401 fish/cmds.c:4422
-#: fish/cmds.c:4443 fish/cmds.c:4461 fish/cmds.c:4481 fish/cmds.c:4500
-#: fish/cmds.c:4521 fish/cmds.c:4536 fish/cmds.c:4551 fish/cmds.c:4567
-#: fish/cmds.c:4583 fish/cmds.c:4602 fish/cmds.c:4618 fish/cmds.c:4637
-#: fish/cmds.c:4655 fish/cmds.c:4671 fish/cmds.c:4690 fish/cmds.c:4711
-#: fish/cmds.c:4732 fish/cmds.c:4752 fish/cmds.c:4784 fish/cmds.c:4799
-#: fish/cmds.c:4813 fish/cmds.c:4835 fish/cmds.c:4856 fish/cmds.c:4877
-#: fish/cmds.c:4897 fish/cmds.c:4912 fish/cmds.c:4932 fish/cmds.c:5024
-#: fish/cmds.c:5042 fish/cmds.c:5060 fish/cmds.c:5078 fish/cmds.c:5094
-#: fish/cmds.c:5113 fish/cmds.c:5147 fish/cmds.c:5162 fish/cmds.c:5182
-#: fish/cmds.c:5197 fish/cmds.c:5231 fish/cmds.c:5249 fish/cmds.c:5267
-#: fish/cmds.c:5285 fish/cmds.c:5305 fish/cmds.c:5320 fish/cmds.c:5337
-#: fish/cmds.c:5354 fish/cmds.c:5374 fish/cmds.c:5393 fish/cmds.c:5412
-#: fish/cmds.c:5431 fish/cmds.c:5452 fish/cmds.c:5491 fish/cmds.c:5512
-#: fish/cmds.c:5550 fish/cmds.c:5565 fish/cmds.c:5581 fish/cmds.c:5600
-#: fish/cmds.c:5621 fish/cmds.c:5641 fish/cmds.c:5657 fish/cmds.c:5674
-#: fish/cmds.c:5693 fish/cmds.c:5768 fish/cmds.c:5807 fish/cmds.c:5884
-#: fish/cmds.c:5958 fish/cmds.c:5993 fish/cmds.c:6014 fish/cmds.c:6033
-#: fish/cmds.c:6054 fish/cmds.c:6074 fish/cmds.c:6097 fish/cmds.c:6138
-#: fish/cmds.c:6177 fish/cmds.c:6196 fish/cmds.c:6213 fish/cmds.c:6229
-#: fish/cmds.c:6244 fish/cmds.c:6260 fish/cmds.c:6285 fish/cmds.c:6307
-#: fish/cmds.c:6329 fish/cmds.c:6351 fish/cmds.c:6373 fish/cmds.c:6395
-#: fish/cmds.c:6417 fish/cmds.c:6439 fish/cmds.c:6461 fish/cmds.c:6483
-#: fish/cmds.c:6505 fish/cmds.c:6527 fish/cmds.c:6548 fish/cmds.c:6569
-#: fish/cmds.c:6588 fish/cmds.c:6607 fish/cmds.c:6626 fish/cmds.c:6644
-#: fish/cmds.c:6665 fish/cmds.c:6701 fish/cmds.c:6716 fish/cmds.c:6731
-#: fish/cmds.c:6748 fish/cmds.c:6765 fish/cmds.c:6780 fish/cmds.c:6795
-#: fish/cmds.c:6810 fish/cmds.c:6825 fish/cmds.c:6842 fish/cmds.c:6876
-#: fish/cmds.c:6914 fish/cmds.c:6946 fish/cmds.c:6961 fish/cmds.c:6976
-#: fish/cmds.c:6989 fish/cmds.c:7003 fish/cmds.c:7021 fish/cmds.c:7057
-#: fish/cmds.c:7093 fish/cmds.c:7130 fish/cmds.c:7168 fish/cmds.c:7207
-#: fish/cmds.c:7246 fish/cmds.c:7282 fish/cmds.c:7297 fish/cmds.c:7318
-#: fish/cmds.c:7338 fish/cmds.c:7358 fish/cmds.c:7376 fish/cmds.c:7394
-#: fish/cmds.c:7428 fish/cmds.c:7498 fish/cmds.c:7536 fish/cmds.c:7592
-#: fish/cmds.c:7616 fish/cmds.c:7640 fish/cmds.c:7666 fish/cmds.c:7723
-#: fish/cmds.c:7742 fish/cmds.c:7785 fish/cmds.c:7803 fish/cmds.c:7840
-#: fish/cmds.c:7875 fish/cmds.c:7893 fish/cmds.c:7913 fish/cmds.c:7968
-#: fish/cmds.c:7986 fish/cmds.c:8006 fish/cmds.c:8026 fish/cmds.c:8043
-#: fish/cmds.c:8061 fish/cmds.c:8086 fish/cmds.c:8104 fish/cmds.c:8122
-#: fish/cmds.c:8140 fish/cmds.c:8158 fish/cmds.c:8178 fish/cmds.c:8211
-#: fish/cmds.c:8227 fish/cmds.c:8248 fish/cmds.c:8268 fish/cmds.c:8282
-#: fish/cmds.c:8296 fish/cmds.c:8331 fish/cmds.c:8368 fish/cmds.c:8406
-#: fish/cmds.c:8460 fish/cmds.c:8480 fish/cmds.c:8514 fish/cmds.c:8528
-#: fish/cmds.c:8545 fish/cmds.c:8583 fish/cmds.c:8604 fish/cmds.c:8626
-#: fish/cmds.c:8649 fish/cmds.c:8688 fish/cmds.c:8711 fish/cmds.c:8747
-#: fish/cmds.c:8776 fish/cmds.c:8805 fish/cmds.c:8832 fish/cmds.c:8849
-#: fish/cmds.c:8879 fish/cmds.c:8897 fish/cmds.c:8915 fish/cmds.c:8931
-#: fish/cmds.c:8946 fish/cmds.c:8967 fish/cmds.c:8986 fish/cmds.c:9003
-#: fish/cmds.c:9043 fish/cmds.c:9084 fish/cmds.c:9126 fish/cmds.c:9163
-#: fish/cmds.c:9180 fish/cmds.c:9198 fish/cmds.c:9216 fish/cmds.c:9235
-#: fish/cmds.c:9254 fish/cmds.c:9273 fish/cmds.c:9292 fish/cmds.c:9311
+#: 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