-#: fish/cmds.c:2353 fish/cmds.c:2365 fish/cmds.c:2378 fish/cmds.c:2393
-#: fish/cmds.c:2408 fish/cmds.c:2424 fish/cmds.c:2441 fish/cmds.c:2456
-#: fish/cmds.c:2471 fish/cmds.c:2486 fish/cmds.c:2501 fish/cmds.c:2516
-#: fish/cmds.c:2530 fish/cmds.c:2544 fish/cmds.c:2559 fish/cmds.c:2573
-#: fish/cmds.c:2587 fish/cmds.c:2601 fish/cmds.c:2615 fish/cmds.c:2629
-#: fish/cmds.c:2643 fish/cmds.c:2658 fish/cmds.c:2690 fish/cmds.c:2704
-#: fish/cmds.c:2718 fish/cmds.c:2734 fish/cmds.c:2748 fish/cmds.c:2763
-#: fish/cmds.c:2777 fish/cmds.c:2792 fish/cmds.c:2806 fish/cmds.c:2821
-#: fish/cmds.c:2835 fish/cmds.c:2851 fish/cmds.c:2868 fish/cmds.c:2884
-#: fish/cmds.c:2903 fish/cmds.c:2919 fish/cmds.c:2937 fish/cmds.c:2955
-#: fish/cmds.c:2973 fish/cmds.c:2990 fish/cmds.c:3007 fish/cmds.c:3025
-#: fish/cmds.c:3043 fish/cmds.c:3061 fish/cmds.c:3075 fish/cmds.c:3089
-#: fish/cmds.c:3106 fish/cmds.c:3121 fish/cmds.c:3134 fish/cmds.c:3151
-#: fish/cmds.c:3171 fish/cmds.c:3191 fish/cmds.c:3210 fish/cmds.c:3225
-#: fish/cmds.c:3240 fish/cmds.c:3255 fish/cmds.c:3270 fish/cmds.c:3285
-#: fish/cmds.c:3300 fish/cmds.c:3315 fish/cmds.c:3331 fish/cmds.c:3352
-#: fish/cmds.c:3387 fish/cmds.c:3401 fish/cmds.c:3422 fish/cmds.c:3442
-#: fish/cmds.c:3461 fish/cmds.c:3479 fish/cmds.c:3496 fish/cmds.c:3514
-#: fish/cmds.c:3530 fish/cmds.c:3547 fish/cmds.c:3559 fish/cmds.c:3572
-#: fish/cmds.c:3590 fish/cmds.c:3607 fish/cmds.c:3624 fish/cmds.c:3641
-#: fish/cmds.c:3658 fish/cmds.c:3676 fish/cmds.c:3714 fish/cmds.c:3769
-#: fish/cmds.c:3788 fish/cmds.c:3807 fish/cmds.c:3826 fish/cmds.c:3842
-#: fish/cmds.c:3862 fish/cmds.c:3898 fish/cmds.c:3918 fish/cmds.c:3995
-#: fish/cmds.c:4032 fish/cmds.c:4046 fish/cmds.c:4061 fish/cmds.c:4073
-#: fish/cmds.c:4086 fish/cmds.c:4106 fish/cmds.c:4126 fish/cmds.c:4146
-#: fish/cmds.c:4166 fish/cmds.c:4186 fish/cmds.c:4206 fish/cmds.c:4224
-#: fish/cmds.c:4239 fish/cmds.c:4254 fish/cmds.c:4271 fish/cmds.c:4288
-#: fish/cmds.c:4306 fish/cmds.c:4340 fish/cmds.c:4357 fish/cmds.c:4374
-#: fish/cmds.c:4389 fish/cmds.c:4405 fish/cmds.c:4426 fish/cmds.c:4447
-#: fish/cmds.c:4469 fish/cmds.c:4490 fish/cmds.c:4509 fish/cmds.c:4530
-#: fish/cmds.c:4551 fish/cmds.c:4569 fish/cmds.c:4589 fish/cmds.c:4608
-#: fish/cmds.c:4629 fish/cmds.c:4644 fish/cmds.c:4659 fish/cmds.c:4675
-#: fish/cmds.c:4691 fish/cmds.c:4710 fish/cmds.c:4726 fish/cmds.c:4745
-#: fish/cmds.c:4763 fish/cmds.c:4779 fish/cmds.c:4798 fish/cmds.c:4819
-#: fish/cmds.c:4840 fish/cmds.c:4860 fish/cmds.c:4892 fish/cmds.c:4907
-#: fish/cmds.c:4921 fish/cmds.c:4943 fish/cmds.c:4964 fish/cmds.c:4985
-#: fish/cmds.c:5005 fish/cmds.c:5020 fish/cmds.c:5040 fish/cmds.c:5132
-#: fish/cmds.c:5150 fish/cmds.c:5168 fish/cmds.c:5186 fish/cmds.c:5202
-#: fish/cmds.c:5221 fish/cmds.c:5255 fish/cmds.c:5270 fish/cmds.c:5290
-#: fish/cmds.c:5305 fish/cmds.c:5339 fish/cmds.c:5357 fish/cmds.c:5375
-#: fish/cmds.c:5393 fish/cmds.c:5413 fish/cmds.c:5428 fish/cmds.c:5445
-#: fish/cmds.c:5462 fish/cmds.c:5482 fish/cmds.c:5501 fish/cmds.c:5520
-#: fish/cmds.c:5539 fish/cmds.c:5560 fish/cmds.c:5599 fish/cmds.c:5620
-#: fish/cmds.c:5658 fish/cmds.c:5673 fish/cmds.c:5689 fish/cmds.c:5708
-#: fish/cmds.c:5729 fish/cmds.c:5749 fish/cmds.c:5765 fish/cmds.c:5782
-#: fish/cmds.c:5801 fish/cmds.c:5876 fish/cmds.c:5915 fish/cmds.c:5992
-#: fish/cmds.c:6066 fish/cmds.c:6101 fish/cmds.c:6122 fish/cmds.c:6141
-#: fish/cmds.c:6162 fish/cmds.c:6182 fish/cmds.c:6205 fish/cmds.c:6246
-#: fish/cmds.c:6285 fish/cmds.c:6304 fish/cmds.c:6321 fish/cmds.c:6337
-#: fish/cmds.c:6352 fish/cmds.c:6368 fish/cmds.c:6393 fish/cmds.c:6415
-#: fish/cmds.c:6437 fish/cmds.c:6459 fish/cmds.c:6481 fish/cmds.c:6503
-#: fish/cmds.c:6525 fish/cmds.c:6547 fish/cmds.c:6569 fish/cmds.c:6591
-#: fish/cmds.c:6613 fish/cmds.c:6635 fish/cmds.c:6656 fish/cmds.c:6677
-#: fish/cmds.c:6696 fish/cmds.c:6715 fish/cmds.c:6734 fish/cmds.c:6752
-#: fish/cmds.c:6773 fish/cmds.c:6809 fish/cmds.c:6824 fish/cmds.c:6839
-#: fish/cmds.c:6856 fish/cmds.c:6873 fish/cmds.c:6888 fish/cmds.c:6903
-#: fish/cmds.c:6918 fish/cmds.c:6933 fish/cmds.c:6950 fish/cmds.c:6984
-#: fish/cmds.c:7022 fish/cmds.c:7054 fish/cmds.c:7069 fish/cmds.c:7084
-#: fish/cmds.c:7097 fish/cmds.c:7111 fish/cmds.c:7129 fish/cmds.c:7165
-#: fish/cmds.c:7201 fish/cmds.c:7238 fish/cmds.c:7276 fish/cmds.c:7315
-#: fish/cmds.c:7354 fish/cmds.c:7390 fish/cmds.c:7405 fish/cmds.c:7426
-#: fish/cmds.c:7446 fish/cmds.c:7466 fish/cmds.c:7484 fish/cmds.c:7502
-#: fish/cmds.c:7536 fish/cmds.c:7606 fish/cmds.c:7644 fish/cmds.c:7700
-#: fish/cmds.c:7724 fish/cmds.c:7748 fish/cmds.c:7774 fish/cmds.c:7831
-#: fish/cmds.c:7850 fish/cmds.c:7893 fish/cmds.c:7911 fish/cmds.c:7948
-#: fish/cmds.c:7983 fish/cmds.c:8001 fish/cmds.c:8021 fish/cmds.c:8076
-#: fish/cmds.c:8094 fish/cmds.c:8114 fish/cmds.c:8134 fish/cmds.c:8151
-#: fish/cmds.c:8169 fish/cmds.c:8194 fish/cmds.c:8212 fish/cmds.c:8230
-#: fish/cmds.c:8248 fish/cmds.c:8266 fish/cmds.c:8286 fish/cmds.c:8319
-#: fish/cmds.c:8335 fish/cmds.c:8356 fish/cmds.c:8376 fish/cmds.c:8390
-#: fish/cmds.c:8404 fish/cmds.c:8439 fish/cmds.c:8476 fish/cmds.c:8514
-#: fish/cmds.c:8568 fish/cmds.c:8588 fish/cmds.c:8622 fish/cmds.c:8636
-#: fish/cmds.c:8653 fish/cmds.c:8691 fish/cmds.c:8712 fish/cmds.c:8734
-#: fish/cmds.c:8757 fish/cmds.c:8796 fish/cmds.c:8819 fish/cmds.c:8855
-#: fish/cmds.c:8884 fish/cmds.c:8913 fish/cmds.c:8940 fish/cmds.c:8957
-#: fish/cmds.c:8987 fish/cmds.c:9005 fish/cmds.c:9023 fish/cmds.c:9039
-#: fish/cmds.c:9054 fish/cmds.c:9075 fish/cmds.c:9094 fish/cmds.c:9111
-#: fish/cmds.c:9151 fish/cmds.c:9192 fish/cmds.c:9234 fish/cmds.c:9271
-#: fish/cmds.c:9288 fish/cmds.c:9306 fish/cmds.c:9324 fish/cmds.c:9343
-#: fish/cmds.c:9362 fish/cmds.c:9381 fish/cmds.c:9400 fish/cmds.c:9419
-#: fish/cmds.c:9439 fish/cmds.c:9475 fish/cmds.c:9524 fish/cmds.c:9560
+#: 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