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