-#: fish/cmds.c:2341 fish/cmds.c:2353 fish/cmds.c:2366 fish/cmds.c:2381
-#: fish/cmds.c:2396 fish/cmds.c:2412 fish/cmds.c:2429 fish/cmds.c:2444
-#: fish/cmds.c:2459 fish/cmds.c:2474 fish/cmds.c:2489 fish/cmds.c:2504
-#: fish/cmds.c:2518 fish/cmds.c:2532 fish/cmds.c:2547 fish/cmds.c:2561
-#: fish/cmds.c:2575 fish/cmds.c:2589 fish/cmds.c:2603 fish/cmds.c:2617
-#: fish/cmds.c:2631 fish/cmds.c:2646 fish/cmds.c:2678 fish/cmds.c:2692
-#: fish/cmds.c:2706 fish/cmds.c:2722 fish/cmds.c:2736 fish/cmds.c:2751
-#: fish/cmds.c:2765 fish/cmds.c:2780 fish/cmds.c:2794 fish/cmds.c:2809
-#: fish/cmds.c:2823 fish/cmds.c:2839 fish/cmds.c:2856 fish/cmds.c:2872
-#: fish/cmds.c:2891 fish/cmds.c:2907 fish/cmds.c:2925 fish/cmds.c:2943
-#: fish/cmds.c:2961 fish/cmds.c:2978 fish/cmds.c:2995 fish/cmds.c:3013
-#: fish/cmds.c:3031 fish/cmds.c:3049 fish/cmds.c:3063 fish/cmds.c:3077
-#: fish/cmds.c:3094 fish/cmds.c:3109 fish/cmds.c:3122 fish/cmds.c:3139
-#: fish/cmds.c:3159 fish/cmds.c:3179 fish/cmds.c:3198 fish/cmds.c:3213
-#: fish/cmds.c:3228 fish/cmds.c:3243 fish/cmds.c:3258 fish/cmds.c:3273
-#: fish/cmds.c:3288 fish/cmds.c:3303 fish/cmds.c:3319 fish/cmds.c:3340
-#: fish/cmds.c:3375 fish/cmds.c:3389 fish/cmds.c:3410 fish/cmds.c:3430
-#: fish/cmds.c:3449 fish/cmds.c:3467 fish/cmds.c:3484 fish/cmds.c:3502
-#: fish/cmds.c:3518 fish/cmds.c:3535 fish/cmds.c:3547 fish/cmds.c:3560
-#: fish/cmds.c:3578 fish/cmds.c:3595 fish/cmds.c:3612 fish/cmds.c:3629
-#: fish/cmds.c:3646 fish/cmds.c:3664 fish/cmds.c:3702 fish/cmds.c:3757
-#: fish/cmds.c:3776 fish/cmds.c:3795 fish/cmds.c:3814 fish/cmds.c:3830
-#: fish/cmds.c:3850 fish/cmds.c:3886 fish/cmds.c:3906 fish/cmds.c:3983
-#: fish/cmds.c:4020 fish/cmds.c:4034 fish/cmds.c:4049 fish/cmds.c:4061
-#: fish/cmds.c:4074 fish/cmds.c:4094 fish/cmds.c:4114 fish/cmds.c:4134
-#: fish/cmds.c:4154 fish/cmds.c:4174 fish/cmds.c:4194 fish/cmds.c:4212
-#: fish/cmds.c:4227 fish/cmds.c:4242 fish/cmds.c:4259 fish/cmds.c:4276
-#: fish/cmds.c:4294 fish/cmds.c:4328 fish/cmds.c:4345 fish/cmds.c:4362
-#: fish/cmds.c:4377 fish/cmds.c:4393 fish/cmds.c:4414 fish/cmds.c:4435
-#: fish/cmds.c:4457 fish/cmds.c:4478 fish/cmds.c:4497 fish/cmds.c:4518
-#: fish/cmds.c:4539 fish/cmds.c:4557 fish/cmds.c:4577 fish/cmds.c:4596
-#: fish/cmds.c:4617 fish/cmds.c:4632 fish/cmds.c:4647 fish/cmds.c:4663
-#: fish/cmds.c:4679 fish/cmds.c:4698 fish/cmds.c:4714 fish/cmds.c:4733
-#: fish/cmds.c:4751 fish/cmds.c:4767 fish/cmds.c:4786 fish/cmds.c:4807
-#: fish/cmds.c:4828 fish/cmds.c:4848 fish/cmds.c:4880 fish/cmds.c:4895
-#: fish/cmds.c:4909 fish/cmds.c:4931 fish/cmds.c:4952 fish/cmds.c:4973
-#: fish/cmds.c:4993 fish/cmds.c:5008 fish/cmds.c:5028 fish/cmds.c:5120
-#: fish/cmds.c:5138 fish/cmds.c:5156 fish/cmds.c:5174 fish/cmds.c:5190
-#: fish/cmds.c:5209 fish/cmds.c:5243 fish/cmds.c:5258 fish/cmds.c:5278
-#: fish/cmds.c:5293 fish/cmds.c:5327 fish/cmds.c:5345 fish/cmds.c:5363
-#: fish/cmds.c:5381 fish/cmds.c:5401 fish/cmds.c:5416 fish/cmds.c:5433
-#: fish/cmds.c:5450 fish/cmds.c:5470 fish/cmds.c:5489 fish/cmds.c:5508
-#: fish/cmds.c:5527 fish/cmds.c:5548 fish/cmds.c:5587 fish/cmds.c:5608
-#: fish/cmds.c:5646 fish/cmds.c:5661 fish/cmds.c:5677 fish/cmds.c:5696
-#: fish/cmds.c:5717 fish/cmds.c:5737 fish/cmds.c:5753 fish/cmds.c:5770
-#: fish/cmds.c:5789 fish/cmds.c:5864 fish/cmds.c:5903 fish/cmds.c:5980
-#: fish/cmds.c:6054 fish/cmds.c:6089 fish/cmds.c:6110 fish/cmds.c:6129
-#: fish/cmds.c:6150 fish/cmds.c:6170 fish/cmds.c:6193 fish/cmds.c:6234
-#: fish/cmds.c:6273 fish/cmds.c:6292 fish/cmds.c:6309 fish/cmds.c:6325
-#: fish/cmds.c:6340 fish/cmds.c:6356 fish/cmds.c:6381 fish/cmds.c:6403
-#: fish/cmds.c:6425 fish/cmds.c:6447 fish/cmds.c:6469 fish/cmds.c:6491
-#: fish/cmds.c:6513 fish/cmds.c:6535 fish/cmds.c:6557 fish/cmds.c:6579
-#: fish/cmds.c:6601 fish/cmds.c:6623 fish/cmds.c:6644 fish/cmds.c:6665
-#: fish/cmds.c:6684 fish/cmds.c:6703 fish/cmds.c:6722 fish/cmds.c:6740
-#: fish/cmds.c:6761 fish/cmds.c:6797 fish/cmds.c:6812 fish/cmds.c:6827
-#: fish/cmds.c:6844 fish/cmds.c:6861 fish/cmds.c:6876 fish/cmds.c:6891
-#: fish/cmds.c:6906 fish/cmds.c:6921 fish/cmds.c:6938 fish/cmds.c:6972
-#: fish/cmds.c:7010 fish/cmds.c:7042 fish/cmds.c:7057 fish/cmds.c:7072
-#: fish/cmds.c:7085 fish/cmds.c:7099 fish/cmds.c:7117 fish/cmds.c:7153
-#: fish/cmds.c:7189 fish/cmds.c:7226 fish/cmds.c:7264 fish/cmds.c:7303
-#: fish/cmds.c:7342 fish/cmds.c:7378 fish/cmds.c:7393 fish/cmds.c:7414
-#: fish/cmds.c:7434 fish/cmds.c:7454 fish/cmds.c:7472 fish/cmds.c:7490
-#: fish/cmds.c:7524 fish/cmds.c:7594 fish/cmds.c:7632 fish/cmds.c:7688
-#: fish/cmds.c:7712 fish/cmds.c:7736 fish/cmds.c:7762 fish/cmds.c:7819
-#: fish/cmds.c:7838 fish/cmds.c:7881 fish/cmds.c:7899 fish/cmds.c:7936
-#: fish/cmds.c:7971 fish/cmds.c:7989 fish/cmds.c:8009 fish/cmds.c:8064
-#: fish/cmds.c:8082 fish/cmds.c:8102 fish/cmds.c:8122 fish/cmds.c:8139
-#: fish/cmds.c:8157 fish/cmds.c:8182 fish/cmds.c:8200 fish/cmds.c:8218
-#: fish/cmds.c:8236 fish/cmds.c:8254 fish/cmds.c:8274 fish/cmds.c:8307
-#: fish/cmds.c:8323 fish/cmds.c:8344 fish/cmds.c:8364 fish/cmds.c:8378
-#: fish/cmds.c:8392 fish/cmds.c:8427 fish/cmds.c:8464 fish/cmds.c:8502
-#: fish/cmds.c:8556 fish/cmds.c:8576 fish/cmds.c:8610 fish/cmds.c:8624
-#: fish/cmds.c:8641 fish/cmds.c:8679 fish/cmds.c:8700 fish/cmds.c:8722
-#: fish/cmds.c:8745 fish/cmds.c:8784 fish/cmds.c:8807 fish/cmds.c:8843
-#: fish/cmds.c:8872 fish/cmds.c:8901 fish/cmds.c:8928 fish/cmds.c:8945
-#: fish/cmds.c:8975 fish/cmds.c:8993 fish/cmds.c:9011 fish/cmds.c:9027
-#: fish/cmds.c:9042 fish/cmds.c:9063 fish/cmds.c:9082 fish/cmds.c:9099
-#: fish/cmds.c:9139 fish/cmds.c:9180 fish/cmds.c:9222 fish/cmds.c:9259
-#: fish/cmds.c:9276 fish/cmds.c:9294 fish/cmds.c:9312 fish/cmds.c:9331
-#: fish/cmds.c:9350 fish/cmds.c:9369 fish/cmds.c:9388 fish/cmds.c:9407
-#: fish/cmds.c:9427 fish/cmds.c:9463
+#: 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