-#: 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
+#: fish/cmds.c:3241 fish/cmds.c:3255 fish/cmds.c:3271 fish/cmds.c:3288
+#: fish/cmds.c:3305 fish/cmds.c:3323 fish/cmds.c:3342 fish/cmds.c:3358
+#: fish/cmds.c:3376 fish/cmds.c:3392 fish/cmds.c:3410 fish/cmds.c:3426
+#: fish/cmds.c:3443 fish/cmds.c:3458 fish/cmds.c:3476 fish/cmds.c:3491
+#: fish/cmds.c:3507 fish/cmds.c:3523 fish/cmds.c:3539 fish/cmds.c:3555
+#: fish/cmds.c:3571 fish/cmds.c:3589 fish/cmds.c:3622 fish/cmds.c:3638
+#: fish/cmds.c:3654 fish/cmds.c:3673 fish/cmds.c:3688 fish/cmds.c:3706
+#: fish/cmds.c:3721 fish/cmds.c:3739 fish/cmds.c:3754 fish/cmds.c:3772
+#: fish/cmds.c:3787 fish/cmds.c:3806 fish/cmds.c:3825 fish/cmds.c:3843
+#: fish/cmds.c:3863 fish/cmds.c:3882 fish/cmds.c:3902 fish/cmds.c:3922
+#: fish/cmds.c:3942 fish/cmds.c:3961 fish/cmds.c:3980 fish/cmds.c:4000
+#: fish/cmds.c:4020 fish/cmds.c:4040 fish/cmds.c:4055 fish/cmds.c:4071
+#: fish/cmds.c:4092 fish/cmds.c:4143 fish/cmds.c:4161 fish/cmds.c:4178
+#: fish/cmds.c:4199 fish/cmds.c:4257 fish/cmds.c:4277 fish/cmds.c:4297
+#: fish/cmds.c:4317 fish/cmds.c:4337 fish/cmds.c:4357 fish/cmds.c:4376
+#: fish/cmds.c:4395 fish/cmds.c:4414 fish/cmds.c:4429 fish/cmds.c:4448
+#: fish/cmds.c:4468 fish/cmds.c:4488 fish/cmds.c:4509 fish/cmds.c:4525
+#: fish/cmds.c:4541 fish/cmds.c:4560 fish/cmds.c:4582 fish/cmds.c:4604
+#: fish/cmds.c:4624 fish/cmds.c:4641 fish/cmds.c:4658 fish/cmds.c:4675
+#: fish/cmds.c:4692 fish/cmds.c:4709 fish/cmds.c:4726 fish/cmds.c:4743
+#: fish/cmds.c:4762 fish/cmds.c:4785 fish/cmds.c:4821 fish/cmds.c:4838
+#: fish/cmds.c:4861 fish/cmds.c:4883 fish/cmds.c:4904 fish/cmds.c:4924
+#: fish/cmds.c:4943 fish/cmds.c:4963 fish/cmds.c:4981 fish/cmds.c:4999
+#: fish/cmds.c:5013 fish/cmds.c:5029 fish/cmds.c:5049 fish/cmds.c:5068
+#: fish/cmds.c:5087 fish/cmds.c:5106 fish/cmds.c:5125 fish/cmds.c:5145
+#: fish/cmds.c:5185 fish/cmds.c:5242 fish/cmds.c:5263 fish/cmds.c:5284
+#: fish/cmds.c:5305 fish/cmds.c:5323 fish/cmds.c:5345 fish/cmds.c:5383
+#: fish/cmds.c:5405 fish/cmds.c:5484 fish/cmds.c:5523 fish/cmds.c:5538
+#: fish/cmds.c:5555 fish/cmds.c:5569 fish/cmds.c:5585 fish/cmds.c:5607
+#: fish/cmds.c:5629 fish/cmds.c:5651 fish/cmds.c:5673 fish/cmds.c:5695
+#: fish/cmds.c:5717 fish/cmds.c:5737 fish/cmds.c:5754 fish/cmds.c:5771
+#: fish/cmds.c:5790 fish/cmds.c:5809 fish/cmds.c:5829 fish/cmds.c:5865
+#: fish/cmds.c:5884 fish/cmds.c:5903 fish/cmds.c:5920 fish/cmds.c:5938
+#: fish/cmds.c:5961 fish/cmds.c:5984 fish/cmds.c:6008 fish/cmds.c:6031
+#: fish/cmds.c:6052 fish/cmds.c:6075 fish/cmds.c:6098 fish/cmds.c:6118
+#: fish/cmds.c:6140 fish/cmds.c:6161 fish/cmds.c:6184 fish/cmds.c:6201
+#: fish/cmds.c:6218 fish/cmds.c:6236 fish/cmds.c:6254 fish/cmds.c:6275
+#: fish/cmds.c:6293 fish/cmds.c:6314 fish/cmds.c:6334 fish/cmds.c:6352
+#: fish/cmds.c:6373 fish/cmds.c:6396 fish/cmds.c:6419 fish/cmds.c:6441
+#: fish/cmds.c:6474 fish/cmds.c:6491 fish/cmds.c:6508 fish/cmds.c:6532
+#: fish/cmds.c:6555 fish/cmds.c:6578 fish/cmds.c:6600 fish/cmds.c:6617
+#: fish/cmds.c:6639 fish/cmds.c:6733 fish/cmds.c:6753 fish/cmds.c:6773
+#: fish/cmds.c:6793 fish/cmds.c:6811 fish/cmds.c:6832 fish/cmds.c:6868
+#: fish/cmds.c:6885 fish/cmds.c:6907 fish/cmds.c:6924 fish/cmds.c:6960
+#: fish/cmds.c:6980 fish/cmds.c:7000 fish/cmds.c:7020 fish/cmds.c:7042
+#: fish/cmds.c:7059 fish/cmds.c:7078 fish/cmds.c:7097 fish/cmds.c:7119
+#: fish/cmds.c:7140 fish/cmds.c:7161 fish/cmds.c:7182 fish/cmds.c:7205
+#: fish/cmds.c:7246 fish/cmds.c:7269 fish/cmds.c:7308 fish/cmds.c:7325
+#: fish/cmds.c:7344 fish/cmds.c:7365 fish/cmds.c:7388 fish/cmds.c:7410
+#: fish/cmds.c:7428 fish/cmds.c:7447 fish/cmds.c:7468 fish/cmds.c:7545
+#: fish/cmds.c:7586 fish/cmds.c:7665 fish/cmds.c:7741 fish/cmds.c:7778
+#: fish/cmds.c:7801 fish/cmds.c:7822 fish/cmds.c:7845 fish/cmds.c:7867
+#: fish/cmds.c:7892 fish/cmds.c:7935 fish/cmds.c:7976 fish/cmds.c:7997
+#: fish/cmds.c:8015 fish/cmds.c:8034 fish/cmds.c:8051 fish/cmds.c:8069
+#: fish/cmds.c:8096 fish/cmds.c:8120 fish/cmds.c:8144 fish/cmds.c:8168
+#: fish/cmds.c:8192 fish/cmds.c:8216 fish/cmds.c:8240 fish/cmds.c:8264
+#: fish/cmds.c:8288 fish/cmds.c:8312 fish/cmds.c:8336 fish/cmds.c:8360
+#: fish/cmds.c:8383 fish/cmds.c:8406 fish/cmds.c:8427 fish/cmds.c:8448
+#: fish/cmds.c:8469 fish/cmds.c:8489 fish/cmds.c:8512 fish/cmds.c:8550
+#: fish/cmds.c:8567 fish/cmds.c:8584 fish/cmds.c:8603 fish/cmds.c:8622
+#: fish/cmds.c:8639 fish/cmds.c:8656 fish/cmds.c:8673 fish/cmds.c:8690
+#: fish/cmds.c:8709 fish/cmds.c:8745 fish/cmds.c:8785 fish/cmds.c:8818
+#: fish/cmds.c:8835 fish/cmds.c:8852 fish/cmds.c:8868 fish/cmds.c:8883
+#: fish/cmds.c:8904 fish/cmds.c:8942 fish/cmds.c:8980 fish/cmds.c:9019
+#: fish/cmds.c:9059 fish/cmds.c:9100 fish/cmds.c:9141 fish/cmds.c:9179
+#: fish/cmds.c:9196 fish/cmds.c:9219 fish/cmds.c:9241 fish/cmds.c:9263
+#: fish/cmds.c:9283 fish/cmds.c:9303 fish/cmds.c:9339 fish/cmds.c:9411
+#: fish/cmds.c:9451 fish/cmds.c:9509 fish/cmds.c:9535 fish/cmds.c:9561
+#: fish/cmds.c:9589 fish/cmds.c:9648 fish/cmds.c:9669 fish/cmds.c:9714
+#: fish/cmds.c:9734 fish/cmds.c:9773 fish/cmds.c:9810 fish/cmds.c:9830
+#: fish/cmds.c:9852 fish/cmds.c:9909 fish/cmds.c:9929 fish/cmds.c:9951
+#: fish/cmds.c:9973 fish/cmds.c:9992 fish/cmds.c:10012 fish/cmds.c:10039
+#: fish/cmds.c:10059 fish/cmds.c:10079 fish/cmds.c:10099 fish/cmds.c:10119
+#: fish/cmds.c:10141 fish/cmds.c:10176 fish/cmds.c:10194 fish/cmds.c:10217
+#: fish/cmds.c:10239 fish/cmds.c:10254 fish/cmds.c:10271 fish/cmds.c:10308
+#: fish/cmds.c:10347 fish/cmds.c:10387 fish/cmds.c:10443 fish/cmds.c:10465
+#: fish/cmds.c:10501 fish/cmds.c:10516 fish/cmds.c:10536 fish/cmds.c:10576
+#: fish/cmds.c:10599 fish/cmds.c:10623 fish/cmds.c:10648 fish/cmds.c:10689
+#: fish/cmds.c:10714 fish/cmds.c:10752 fish/cmds.c:10783 fish/cmds.c:10814
+#: fish/cmds.c:10842 fish/cmds.c:10862 fish/cmds.c:10894 fish/cmds.c:10914
+#: fish/cmds.c:10934 fish/cmds.c:10951 fish/cmds.c:10969 fish/cmds.c:10992
+#: fish/cmds.c:11013 fish/cmds.c:11032 fish/cmds.c:11074 fish/cmds.c:11117
+#: fish/cmds.c:11161 fish/cmds.c:11200 fish/cmds.c:11219 fish/cmds.c:11239
+#: fish/cmds.c:11259 fish/cmds.c:11280 fish/cmds.c:11301 fish/cmds.c:11322
+#: fish/cmds.c:11343 fish/cmds.c:11364 fish/cmds.c:11386 fish/cmds.c:11424
+#: fish/cmds.c:11475 fish/cmds.c:11513 fish/cmds.c:11569 fish/cmds.c:11592
+#: fish/cmds.c:11659 fish/cmds.c:11688 fish/cmds.c:11715