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