-#: fish/cmds.c:2366 fish/cmds.c:2379 fish/cmds.c:2394 fish/cmds.c:2410
-#: fish/cmds.c:2426 fish/cmds.c:2443 fish/cmds.c:2461 fish/cmds.c:2476
-#: fish/cmds.c:2493 fish/cmds.c:2508 fish/cmds.c:2525 fish/cmds.c:2540
-#: fish/cmds.c:2556 fish/cmds.c:2570 fish/cmds.c:2587 fish/cmds.c:2601
-#: fish/cmds.c:2616 fish/cmds.c:2631 fish/cmds.c:2646 fish/cmds.c:2661
-#: fish/cmds.c:2676 fish/cmds.c:2693 fish/cmds.c:2725 fish/cmds.c:2740
-#: fish/cmds.c:2755 fish/cmds.c:2773 fish/cmds.c:2787 fish/cmds.c:2804
-#: fish/cmds.c:2818 fish/cmds.c:2835 fish/cmds.c:2849 fish/cmds.c:2866
-#: fish/cmds.c:2880 fish/cmds.c:2898 fish/cmds.c:2916 fish/cmds.c:2933
-#: fish/cmds.c:2952 fish/cmds.c:2970 fish/cmds.c:2989 fish/cmds.c:3008
-#: fish/cmds.c:3027 fish/cmds.c:3045 fish/cmds.c:3063 fish/cmds.c:3082
-#: fish/cmds.c:3101 fish/cmds.c:3120 fish/cmds.c:3134 fish/cmds.c:3149
-#: fish/cmds.c:3169 fish/cmds.c:3220 fish/cmds.c:3235 fish/cmds.c:3250
-#: fish/cmds.c:3268 fish/cmds.c:3289 fish/cmds.c:3310 fish/cmds.c:3329
-#: fish/cmds.c:3345 fish/cmds.c:3361 fish/cmds.c:3377 fish/cmds.c:3393
-#: fish/cmds.c:3409 fish/cmds.c:3425 fish/cmds.c:3441 fish/cmds.c:3459
-#: fish/cmds.c:3481 fish/cmds.c:3516 fish/cmds.c:3532 fish/cmds.c:3554
-#: fish/cmds.c:3575 fish/cmds.c:3595 fish/cmds.c:3614 fish/cmds.c:3632
-#: fish/cmds.c:3651 fish/cmds.c:3668 fish/cmds.c:3685 fish/cmds.c:3698
-#: fish/cmds.c:3713 fish/cmds.c:3732 fish/cmds.c:3750 fish/cmds.c:3768
-#: fish/cmds.c:3786 fish/cmds.c:3804 fish/cmds.c:3823 fish/cmds.c:3862
-#: fish/cmds.c:3918 fish/cmds.c:3938 fish/cmds.c:3958 fish/cmds.c:3978
-#: fish/cmds.c:3995 fish/cmds.c:4016 fish/cmds.c:4053 fish/cmds.c:4074
-#: fish/cmds.c:4152 fish/cmds.c:4190 fish/cmds.c:4204 fish/cmds.c:4220
-#: fish/cmds.c:4233 fish/cmds.c:4248 fish/cmds.c:4269 fish/cmds.c:4290
-#: fish/cmds.c:4311 fish/cmds.c:4332 fish/cmds.c:4353 fish/cmds.c:4374
-#: fish/cmds.c:4393 fish/cmds.c:4409 fish/cmds.c:4425 fish/cmds.c:4443
-#: fish/cmds.c:4461 fish/cmds.c:4480 fish/cmds.c:4515 fish/cmds.c:4533
-#: fish/cmds.c:4551 fish/cmds.c:4567 fish/cmds.c:4584 fish/cmds.c:4606
-#: fish/cmds.c:4628 fish/cmds.c:4651 fish/cmds.c:4673 fish/cmds.c:4693
-#: fish/cmds.c:4715 fish/cmds.c:4737 fish/cmds.c:4756 fish/cmds.c:4777
-#: fish/cmds.c:4797 fish/cmds.c:4819 fish/cmds.c:4835 fish/cmds.c:4851
-#: fish/cmds.c:4868 fish/cmds.c:4885 fish/cmds.c:4905 fish/cmds.c:4922
-#: fish/cmds.c:4942 fish/cmds.c:4961 fish/cmds.c:4978 fish/cmds.c:4998
-#: fish/cmds.c:5020 fish/cmds.c:5042 fish/cmds.c:5063 fish/cmds.c:5095
-#: fish/cmds.c:5111 fish/cmds.c:5127 fish/cmds.c:5150 fish/cmds.c:5172
-#: fish/cmds.c:5194 fish/cmds.c:5215 fish/cmds.c:5231 fish/cmds.c:5252
-#: fish/cmds.c:5345 fish/cmds.c:5364 fish/cmds.c:5383 fish/cmds.c:5402
-#: fish/cmds.c:5419 fish/cmds.c:5439 fish/cmds.c:5474 fish/cmds.c:5490
-#: fish/cmds.c:5511 fish/cmds.c:5527 fish/cmds.c:5562 fish/cmds.c:5581
-#: fish/cmds.c:5600 fish/cmds.c:5619 fish/cmds.c:5640 fish/cmds.c:5656
-#: fish/cmds.c:5674 fish/cmds.c:5692 fish/cmds.c:5713 fish/cmds.c:5733
-#: fish/cmds.c:5753 fish/cmds.c:5773 fish/cmds.c:5795 fish/cmds.c:5835
-#: fish/cmds.c:5857 fish/cmds.c:5895 fish/cmds.c:5911 fish/cmds.c:5929
-#: fish/cmds.c:5949 fish/cmds.c:5971 fish/cmds.c:5992 fish/cmds.c:6009
-#: fish/cmds.c:6027 fish/cmds.c:6047 fish/cmds.c:6123 fish/cmds.c:6163
-#: fish/cmds.c:6241 fish/cmds.c:6316 fish/cmds.c:6352 fish/cmds.c:6374
-#: fish/cmds.c:6394 fish/cmds.c:6416 fish/cmds.c:6437 fish/cmds.c:6461
-#: fish/cmds.c:6503 fish/cmds.c:6543 fish/cmds.c:6563 fish/cmds.c:6580
-#: fish/cmds.c:6598 fish/cmds.c:6614 fish/cmds.c:6631 fish/cmds.c:6657
-#: fish/cmds.c:6680 fish/cmds.c:6703 fish/cmds.c:6726 fish/cmds.c:6749
-#: fish/cmds.c:6772 fish/cmds.c:6795 fish/cmds.c:6818 fish/cmds.c:6841
-#: fish/cmds.c:6864 fish/cmds.c:6887 fish/cmds.c:6910 fish/cmds.c:6932
-#: fish/cmds.c:6954 fish/cmds.c:6974 fish/cmds.c:6994 fish/cmds.c:7014
-#: fish/cmds.c:7033 fish/cmds.c:7055 fish/cmds.c:7092 fish/cmds.c:7108
-#: fish/cmds.c:7124 fish/cmds.c:7142 fish/cmds.c:7160 fish/cmds.c:7176
-#: fish/cmds.c:7192 fish/cmds.c:7208 fish/cmds.c:7224 fish/cmds.c:7242
-#: fish/cmds.c:7277 fish/cmds.c:7316 fish/cmds.c:7348 fish/cmds.c:7364
-#: fish/cmds.c:7380 fish/cmds.c:7395 fish/cmds.c:7409 fish/cmds.c:7429
-#: fish/cmds.c:7466 fish/cmds.c:7503 fish/cmds.c:7541 fish/cmds.c:7580
-#: fish/cmds.c:7620 fish/cmds.c:7660 fish/cmds.c:7697 fish/cmds.c:7713
-#: fish/cmds.c:7735 fish/cmds.c:7756 fish/cmds.c:7777 fish/cmds.c:7796
-#: fish/cmds.c:7815 fish/cmds.c:7850 fish/cmds.c:7921 fish/cmds.c:7960
-#: fish/cmds.c:8017 fish/cmds.c:8042 fish/cmds.c:8067 fish/cmds.c:8094
-#: fish/cmds.c:8152 fish/cmds.c:8172 fish/cmds.c:8216 fish/cmds.c:8235
-#: fish/cmds.c:8273 fish/cmds.c:8309 fish/cmds.c:8328 fish/cmds.c:8349
-#: fish/cmds.c:8405 fish/cmds.c:8424 fish/cmds.c:8445 fish/cmds.c:8466
-#: fish/cmds.c:8484 fish/cmds.c:8503 fish/cmds.c:8529 fish/cmds.c:8548
-#: fish/cmds.c:8567 fish/cmds.c:8586 fish/cmds.c:8605 fish/cmds.c:8626
-#: fish/cmds.c:8660 fish/cmds.c:8677 fish/cmds.c:8699 fish/cmds.c:8720
-#: fish/cmds.c:8734 fish/cmds.c:8750 fish/cmds.c:8786 fish/cmds.c:8824
-#: fish/cmds.c:8863 fish/cmds.c:8918 fish/cmds.c:8939 fish/cmds.c:8974
-#: fish/cmds.c:8988 fish/cmds.c:9007 fish/cmds.c:9046 fish/cmds.c:9068
-#: fish/cmds.c:9091 fish/cmds.c:9115 fish/cmds.c:9155 fish/cmds.c:9179
-#: fish/cmds.c:9216 fish/cmds.c:9246 fish/cmds.c:9276 fish/cmds.c:9303
-#: fish/cmds.c:9322 fish/cmds.c:9353 fish/cmds.c:9372 fish/cmds.c:9391
-#: fish/cmds.c:9407 fish/cmds.c:9424 fish/cmds.c:9446 fish/cmds.c:9466
-#: fish/cmds.c:9484 fish/cmds.c:9525 fish/cmds.c:9567 fish/cmds.c:9610
-#: fish/cmds.c:9648 fish/cmds.c:9666 fish/cmds.c:9685 fish/cmds.c:9704
-#: fish/cmds.c:9724 fish/cmds.c:9744 fish/cmds.c:9764 fish/cmds.c:9784
-#: fish/cmds.c:9804 fish/cmds.c:9825 fish/cmds.c:9862 fish/cmds.c:9912
-#: fish/cmds.c:9949 fish/cmds.c:10004
+#: fish/cmds.c:3438 fish/cmds.c:3452 fish/cmds.c:3468 fish/cmds.c:3485
+#: fish/cmds.c:3502 fish/cmds.c:3520 fish/cmds.c:3539 fish/cmds.c:3555
+#: fish/cmds.c:3573 fish/cmds.c:3589 fish/cmds.c:3607 fish/cmds.c:3623
+#: fish/cmds.c:3640 fish/cmds.c:3655 fish/cmds.c:3673 fish/cmds.c:3688
+#: fish/cmds.c:3704 fish/cmds.c:3720 fish/cmds.c:3736 fish/cmds.c:3752
+#: fish/cmds.c:3768 fish/cmds.c:3786 fish/cmds.c:3819 fish/cmds.c:3835
+#: fish/cmds.c:3851 fish/cmds.c:3870 fish/cmds.c:3885 fish/cmds.c:3903
+#: fish/cmds.c:3918 fish/cmds.c:3936 fish/cmds.c:3951 fish/cmds.c:3969
+#: fish/cmds.c:3984 fish/cmds.c:4003 fish/cmds.c:4022 fish/cmds.c:4040
+#: fish/cmds.c:4060 fish/cmds.c:4079 fish/cmds.c:4099 fish/cmds.c:4119
+#: fish/cmds.c:4139 fish/cmds.c:4158 fish/cmds.c:4177 fish/cmds.c:4197
+#: fish/cmds.c:4217 fish/cmds.c:4237 fish/cmds.c:4252 fish/cmds.c:4268
+#: fish/cmds.c:4289 fish/cmds.c:4340 fish/cmds.c:4358 fish/cmds.c:4375
+#: fish/cmds.c:4396 fish/cmds.c:4449 fish/cmds.c:4469 fish/cmds.c:4490
+#: fish/cmds.c:4506 fish/cmds.c:4522 fish/cmds.c:4541 fish/cmds.c:4563
+#: fish/cmds.c:4585 fish/cmds.c:4605 fish/cmds.c:4622 fish/cmds.c:4639
+#: fish/cmds.c:4656 fish/cmds.c:4673 fish/cmds.c:4690 fish/cmds.c:4707
+#: fish/cmds.c:4724 fish/cmds.c:4743 fish/cmds.c:4766 fish/cmds.c:4802
+#: fish/cmds.c:4819 fish/cmds.c:4842 fish/cmds.c:4864 fish/cmds.c:4885
+#: fish/cmds.c:4905 fish/cmds.c:4924 fish/cmds.c:4944 fish/cmds.c:4962
+#: fish/cmds.c:4980 fish/cmds.c:4994 fish/cmds.c:5010 fish/cmds.c:5030
+#: fish/cmds.c:5049 fish/cmds.c:5068 fish/cmds.c:5087 fish/cmds.c:5106
+#: fish/cmds.c:5126 fish/cmds.c:5166 fish/cmds.c:5223 fish/cmds.c:5244
+#: fish/cmds.c:5265 fish/cmds.c:5286 fish/cmds.c:5304 fish/cmds.c:5326
+#: fish/cmds.c:5364 fish/cmds.c:5386 fish/cmds.c:5465 fish/cmds.c:5504
+#: fish/cmds.c:5519 fish/cmds.c:5536 fish/cmds.c:5550 fish/cmds.c:5566
+#: fish/cmds.c:5588 fish/cmds.c:5610 fish/cmds.c:5632 fish/cmds.c:5654
+#: fish/cmds.c:5676 fish/cmds.c:5698 fish/cmds.c:5718 fish/cmds.c:5735
+#: fish/cmds.c:5752 fish/cmds.c:5771 fish/cmds.c:5790 fish/cmds.c:5810
+#: fish/cmds.c:5846 fish/cmds.c:5865 fish/cmds.c:5884 fish/cmds.c:5901
+#: fish/cmds.c:5919 fish/cmds.c:5942 fish/cmds.c:5965 fish/cmds.c:5989
+#: fish/cmds.c:6012 fish/cmds.c:6033 fish/cmds.c:6056 fish/cmds.c:6079
+#: fish/cmds.c:6099 fish/cmds.c:6121 fish/cmds.c:6142 fish/cmds.c:6165
+#: fish/cmds.c:6182 fish/cmds.c:6199 fish/cmds.c:6217 fish/cmds.c:6235
+#: fish/cmds.c:6256 fish/cmds.c:6274 fish/cmds.c:6295 fish/cmds.c:6315
+#: fish/cmds.c:6333 fish/cmds.c:6354 fish/cmds.c:6377 fish/cmds.c:6400
+#: fish/cmds.c:6422 fish/cmds.c:6455 fish/cmds.c:6472 fish/cmds.c:6489
+#: fish/cmds.c:6513 fish/cmds.c:6536 fish/cmds.c:6559 fish/cmds.c:6581
+#: fish/cmds.c:6598 fish/cmds.c:6620 fish/cmds.c:6714 fish/cmds.c:6734
+#: fish/cmds.c:6754 fish/cmds.c:6774 fish/cmds.c:6792 fish/cmds.c:6813
+#: fish/cmds.c:6849 fish/cmds.c:6866 fish/cmds.c:6888 fish/cmds.c:6905
+#: fish/cmds.c:6941 fish/cmds.c:6961 fish/cmds.c:6981 fish/cmds.c:7001
+#: fish/cmds.c:7023 fish/cmds.c:7040 fish/cmds.c:7059 fish/cmds.c:7078
+#: fish/cmds.c:7100 fish/cmds.c:7121 fish/cmds.c:7142 fish/cmds.c:7163
+#: fish/cmds.c:7186 fish/cmds.c:7227 fish/cmds.c:7250 fish/cmds.c:7289
+#: fish/cmds.c:7306 fish/cmds.c:7325 fish/cmds.c:7346 fish/cmds.c:7369
+#: fish/cmds.c:7391 fish/cmds.c:7409 fish/cmds.c:7428 fish/cmds.c:7449
+#: fish/cmds.c:7526 fish/cmds.c:7567 fish/cmds.c:7646 fish/cmds.c:7722
+#: fish/cmds.c:7759 fish/cmds.c:7782 fish/cmds.c:7803 fish/cmds.c:7826
+#: fish/cmds.c:7848 fish/cmds.c:7873 fish/cmds.c:7916 fish/cmds.c:7957
+#: fish/cmds.c:7978 fish/cmds.c:7996 fish/cmds.c:8015 fish/cmds.c:8032
+#: fish/cmds.c:8050 fish/cmds.c:8077 fish/cmds.c:8101 fish/cmds.c:8125
+#: fish/cmds.c:8149 fish/cmds.c:8173 fish/cmds.c:8197 fish/cmds.c:8221
+#: fish/cmds.c:8245 fish/cmds.c:8269 fish/cmds.c:8293 fish/cmds.c:8317
+#: fish/cmds.c:8341 fish/cmds.c:8364 fish/cmds.c:8387 fish/cmds.c:8408
+#: fish/cmds.c:8429 fish/cmds.c:8450 fish/cmds.c:8470 fish/cmds.c:8493
+#: fish/cmds.c:8531 fish/cmds.c:8548 fish/cmds.c:8565 fish/cmds.c:8584
+#: fish/cmds.c:8603 fish/cmds.c:8620 fish/cmds.c:8637 fish/cmds.c:8654
+#: fish/cmds.c:8671 fish/cmds.c:8690 fish/cmds.c:8726 fish/cmds.c:8766
+#: fish/cmds.c:8799 fish/cmds.c:8816 fish/cmds.c:8833 fish/cmds.c:8849
+#: fish/cmds.c:8864 fish/cmds.c:8885 fish/cmds.c:8923 fish/cmds.c:8961
+#: fish/cmds.c:9000 fish/cmds.c:9040 fish/cmds.c:9081 fish/cmds.c:9122
+#: fish/cmds.c:9160 fish/cmds.c:9177 fish/cmds.c:9200 fish/cmds.c:9222
+#: fish/cmds.c:9244 fish/cmds.c:9264 fish/cmds.c:9284 fish/cmds.c:9320
+#: fish/cmds.c:9392 fish/cmds.c:9432 fish/cmds.c:9490 fish/cmds.c:9516
+#: fish/cmds.c:9542 fish/cmds.c:9570 fish/cmds.c:9629 fish/cmds.c:9650
+#: fish/cmds.c:9695 fish/cmds.c:9715 fish/cmds.c:9754 fish/cmds.c:9791
+#: fish/cmds.c:9811 fish/cmds.c:9833 fish/cmds.c:9890 fish/cmds.c:9910
+#: fish/cmds.c:9932 fish/cmds.c:9954 fish/cmds.c:9973 fish/cmds.c:9993
+#: fish/cmds.c:10020 fish/cmds.c:10040 fish/cmds.c:10060 fish/cmds.c:10080
+#: fish/cmds.c:10100 fish/cmds.c:10122 fish/cmds.c:10157 fish/cmds.c:10175
+#: fish/cmds.c:10198 fish/cmds.c:10220 fish/cmds.c:10235 fish/cmds.c:10252
+#: fish/cmds.c:10289 fish/cmds.c:10328 fish/cmds.c:10368 fish/cmds.c:10424
+#: fish/cmds.c:10446 fish/cmds.c:10482 fish/cmds.c:10497 fish/cmds.c:10517
+#: fish/cmds.c:10557 fish/cmds.c:10580 fish/cmds.c:10604 fish/cmds.c:10629
+#: fish/cmds.c:10670 fish/cmds.c:10695 fish/cmds.c:10733 fish/cmds.c:10764
+#: fish/cmds.c:10795 fish/cmds.c:10823 fish/cmds.c:10843 fish/cmds.c:10875
+#: fish/cmds.c:10895 fish/cmds.c:10915 fish/cmds.c:10932 fish/cmds.c:10950
+#: fish/cmds.c:10973 fish/cmds.c:10994 fish/cmds.c:11013 fish/cmds.c:11055
+#: fish/cmds.c:11098 fish/cmds.c:11142 fish/cmds.c:11181 fish/cmds.c:11200
+#: fish/cmds.c:11220 fish/cmds.c:11240 fish/cmds.c:11261 fish/cmds.c:11282
+#: fish/cmds.c:11303 fish/cmds.c:11324 fish/cmds.c:11345 fish/cmds.c:11367
+#: fish/cmds.c:11405 fish/cmds.c:11456 fish/cmds.c:11494 fish/cmds.c:11550