-#: 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:3402 fish/cmds.c:3416 fish/cmds.c:3432 fish/cmds.c:3449
+#: fish/cmds.c:3466 fish/cmds.c:3484 fish/cmds.c:3503 fish/cmds.c:3519
+#: fish/cmds.c:3537 fish/cmds.c:3553 fish/cmds.c:3571 fish/cmds.c:3587
+#: fish/cmds.c:3604 fish/cmds.c:3619 fish/cmds.c:3637 fish/cmds.c:3652
+#: fish/cmds.c:3668 fish/cmds.c:3684 fish/cmds.c:3700 fish/cmds.c:3716
+#: fish/cmds.c:3732 fish/cmds.c:3750 fish/cmds.c:3783 fish/cmds.c:3799
+#: fish/cmds.c:3815 fish/cmds.c:3834 fish/cmds.c:3849 fish/cmds.c:3867
+#: fish/cmds.c:3882 fish/cmds.c:3900 fish/cmds.c:3915 fish/cmds.c:3933
+#: fish/cmds.c:3948 fish/cmds.c:3967 fish/cmds.c:3986 fish/cmds.c:4004
+#: fish/cmds.c:4024 fish/cmds.c:4043 fish/cmds.c:4063 fish/cmds.c:4083
+#: fish/cmds.c:4103 fish/cmds.c:4122 fish/cmds.c:4141 fish/cmds.c:4161
+#: fish/cmds.c:4181 fish/cmds.c:4201 fish/cmds.c:4216 fish/cmds.c:4232
+#: fish/cmds.c:4253 fish/cmds.c:4304 fish/cmds.c:4322 fish/cmds.c:4342
+#: fish/cmds.c:4358 fish/cmds.c:4374 fish/cmds.c:4393 fish/cmds.c:4415
+#: fish/cmds.c:4437 fish/cmds.c:4457 fish/cmds.c:4474 fish/cmds.c:4491
+#: fish/cmds.c:4508 fish/cmds.c:4525 fish/cmds.c:4542 fish/cmds.c:4559
+#: fish/cmds.c:4576 fish/cmds.c:4595 fish/cmds.c:4618 fish/cmds.c:4654
+#: fish/cmds.c:4671 fish/cmds.c:4694 fish/cmds.c:4716 fish/cmds.c:4737
+#: fish/cmds.c:4757 fish/cmds.c:4776 fish/cmds.c:4796 fish/cmds.c:4814
+#: fish/cmds.c:4832 fish/cmds.c:4846 fish/cmds.c:4862 fish/cmds.c:4882
+#: fish/cmds.c:4901 fish/cmds.c:4920 fish/cmds.c:4939 fish/cmds.c:4958
+#: fish/cmds.c:4978 fish/cmds.c:5018 fish/cmds.c:5075 fish/cmds.c:5096
+#: fish/cmds.c:5117 fish/cmds.c:5138 fish/cmds.c:5156 fish/cmds.c:5178
+#: fish/cmds.c:5216 fish/cmds.c:5238 fish/cmds.c:5317 fish/cmds.c:5356
+#: fish/cmds.c:5371 fish/cmds.c:5388 fish/cmds.c:5402 fish/cmds.c:5418
+#: fish/cmds.c:5440 fish/cmds.c:5462 fish/cmds.c:5484 fish/cmds.c:5506
+#: fish/cmds.c:5528 fish/cmds.c:5550 fish/cmds.c:5570 fish/cmds.c:5587
+#: fish/cmds.c:5604 fish/cmds.c:5623 fish/cmds.c:5642 fish/cmds.c:5662
+#: fish/cmds.c:5698 fish/cmds.c:5717 fish/cmds.c:5736 fish/cmds.c:5753
+#: fish/cmds.c:5771 fish/cmds.c:5794 fish/cmds.c:5817 fish/cmds.c:5841
+#: fish/cmds.c:5864 fish/cmds.c:5885 fish/cmds.c:5908 fish/cmds.c:5931
+#: fish/cmds.c:5951 fish/cmds.c:5973 fish/cmds.c:5994 fish/cmds.c:6017
+#: fish/cmds.c:6034 fish/cmds.c:6051 fish/cmds.c:6069 fish/cmds.c:6087
+#: fish/cmds.c:6108 fish/cmds.c:6126 fish/cmds.c:6147 fish/cmds.c:6167
+#: fish/cmds.c:6185 fish/cmds.c:6206 fish/cmds.c:6229 fish/cmds.c:6252
+#: fish/cmds.c:6274 fish/cmds.c:6307 fish/cmds.c:6324 fish/cmds.c:6341
+#: fish/cmds.c:6365 fish/cmds.c:6388 fish/cmds.c:6411 fish/cmds.c:6433
+#: fish/cmds.c:6450 fish/cmds.c:6472 fish/cmds.c:6566 fish/cmds.c:6586
+#: fish/cmds.c:6606 fish/cmds.c:6626 fish/cmds.c:6644 fish/cmds.c:6665
+#: fish/cmds.c:6701 fish/cmds.c:6718 fish/cmds.c:6740 fish/cmds.c:6757
+#: fish/cmds.c:6793 fish/cmds.c:6813 fish/cmds.c:6833 fish/cmds.c:6853
+#: fish/cmds.c:6875 fish/cmds.c:6892 fish/cmds.c:6911 fish/cmds.c:6930
+#: fish/cmds.c:6952 fish/cmds.c:6973 fish/cmds.c:6994 fish/cmds.c:7015
+#: fish/cmds.c:7038 fish/cmds.c:7079 fish/cmds.c:7102 fish/cmds.c:7141
+#: fish/cmds.c:7158 fish/cmds.c:7177 fish/cmds.c:7198 fish/cmds.c:7221
+#: fish/cmds.c:7243 fish/cmds.c:7261 fish/cmds.c:7280 fish/cmds.c:7301
+#: fish/cmds.c:7378 fish/cmds.c:7419 fish/cmds.c:7498 fish/cmds.c:7574
+#: fish/cmds.c:7611 fish/cmds.c:7634 fish/cmds.c:7655 fish/cmds.c:7678
+#: fish/cmds.c:7700 fish/cmds.c:7725 fish/cmds.c:7768 fish/cmds.c:7809
+#: fish/cmds.c:7830 fish/cmds.c:7848 fish/cmds.c:7867 fish/cmds.c:7884
+#: fish/cmds.c:7902 fish/cmds.c:7929 fish/cmds.c:7953 fish/cmds.c:7977
+#: fish/cmds.c:8001 fish/cmds.c:8025 fish/cmds.c:8049 fish/cmds.c:8073
+#: fish/cmds.c:8097 fish/cmds.c:8121 fish/cmds.c:8145 fish/cmds.c:8169
+#: fish/cmds.c:8193 fish/cmds.c:8216 fish/cmds.c:8239 fish/cmds.c:8260
+#: fish/cmds.c:8281 fish/cmds.c:8302 fish/cmds.c:8322 fish/cmds.c:8345
+#: fish/cmds.c:8383 fish/cmds.c:8400 fish/cmds.c:8417 fish/cmds.c:8436
+#: fish/cmds.c:8455 fish/cmds.c:8472 fish/cmds.c:8489 fish/cmds.c:8506
+#: fish/cmds.c:8523 fish/cmds.c:8542 fish/cmds.c:8578 fish/cmds.c:8618
+#: fish/cmds.c:8651 fish/cmds.c:8668 fish/cmds.c:8685 fish/cmds.c:8701
+#: fish/cmds.c:8716 fish/cmds.c:8737 fish/cmds.c:8775 fish/cmds.c:8813
+#: fish/cmds.c:8852 fish/cmds.c:8892 fish/cmds.c:8933 fish/cmds.c:8974
+#: fish/cmds.c:9012 fish/cmds.c:9029 fish/cmds.c:9052 fish/cmds.c:9074
+#: fish/cmds.c:9096 fish/cmds.c:9116 fish/cmds.c:9136 fish/cmds.c:9172
+#: fish/cmds.c:9244 fish/cmds.c:9284 fish/cmds.c:9342 fish/cmds.c:9368
+#: fish/cmds.c:9394 fish/cmds.c:9422 fish/cmds.c:9481 fish/cmds.c:9502
+#: fish/cmds.c:9547 fish/cmds.c:9567 fish/cmds.c:9606 fish/cmds.c:9643
+#: fish/cmds.c:9663 fish/cmds.c:9685 fish/cmds.c:9742 fish/cmds.c:9762
+#: fish/cmds.c:9784 fish/cmds.c:9806 fish/cmds.c:9825 fish/cmds.c:9845
+#: fish/cmds.c:9872 fish/cmds.c:9892 fish/cmds.c:9912 fish/cmds.c:9932
+#: fish/cmds.c:9952 fish/cmds.c:9974 fish/cmds.c:10009 fish/cmds.c:10027
+#: fish/cmds.c:10050 fish/cmds.c:10072 fish/cmds.c:10087 fish/cmds.c:10104
+#: fish/cmds.c:10141 fish/cmds.c:10180 fish/cmds.c:10220 fish/cmds.c:10276
+#: fish/cmds.c:10298 fish/cmds.c:10334 fish/cmds.c:10349 fish/cmds.c:10369
+#: fish/cmds.c:10409 fish/cmds.c:10432 fish/cmds.c:10456 fish/cmds.c:10481
+#: fish/cmds.c:10522 fish/cmds.c:10547 fish/cmds.c:10585 fish/cmds.c:10616
+#: fish/cmds.c:10647 fish/cmds.c:10675 fish/cmds.c:10695 fish/cmds.c:10727
+#: fish/cmds.c:10747 fish/cmds.c:10767 fish/cmds.c:10784 fish/cmds.c:10802
+#: fish/cmds.c:10825 fish/cmds.c:10846 fish/cmds.c:10865 fish/cmds.c:10907
+#: fish/cmds.c:10950 fish/cmds.c:10994 fish/cmds.c:11033 fish/cmds.c:11052
+#: fish/cmds.c:11072 fish/cmds.c:11092 fish/cmds.c:11113 fish/cmds.c:11134
+#: fish/cmds.c:11155 fish/cmds.c:11176 fish/cmds.c:11197 fish/cmds.c:11219
+#: fish/cmds.c:11257 fish/cmds.c:11308 fish/cmds.c:11346 fish/cmds.c:11402