-#: 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:3420 fish/cmds.c:3434 fish/cmds.c:3450 fish/cmds.c:3467
+#: fish/cmds.c:3484 fish/cmds.c:3502 fish/cmds.c:3521 fish/cmds.c:3537
+#: fish/cmds.c:3555 fish/cmds.c:3571 fish/cmds.c:3589 fish/cmds.c:3605
+#: fish/cmds.c:3622 fish/cmds.c:3637 fish/cmds.c:3655 fish/cmds.c:3670
+#: fish/cmds.c:3686 fish/cmds.c:3702 fish/cmds.c:3718 fish/cmds.c:3734
+#: fish/cmds.c:3750 fish/cmds.c:3768 fish/cmds.c:3801 fish/cmds.c:3817
+#: fish/cmds.c:3833 fish/cmds.c:3852 fish/cmds.c:3867 fish/cmds.c:3885
+#: fish/cmds.c:3900 fish/cmds.c:3918 fish/cmds.c:3933 fish/cmds.c:3951
+#: fish/cmds.c:3966 fish/cmds.c:3985 fish/cmds.c:4004 fish/cmds.c:4022
+#: fish/cmds.c:4042 fish/cmds.c:4061 fish/cmds.c:4081 fish/cmds.c:4101
+#: fish/cmds.c:4121 fish/cmds.c:4140 fish/cmds.c:4159 fish/cmds.c:4179
+#: fish/cmds.c:4199 fish/cmds.c:4219 fish/cmds.c:4234 fish/cmds.c:4250
+#: fish/cmds.c:4271 fish/cmds.c:4322 fish/cmds.c:4340 fish/cmds.c:4357
+#: fish/cmds.c:4378 fish/cmds.c:4432 fish/cmds.c:4448 fish/cmds.c:4464
+#: fish/cmds.c:4483 fish/cmds.c:4505 fish/cmds.c:4527 fish/cmds.c:4547
+#: fish/cmds.c:4564 fish/cmds.c:4581 fish/cmds.c:4598 fish/cmds.c:4615
+#: fish/cmds.c:4632 fish/cmds.c:4649 fish/cmds.c:4666 fish/cmds.c:4685
+#: fish/cmds.c:4708 fish/cmds.c:4744 fish/cmds.c:4761 fish/cmds.c:4784
+#: fish/cmds.c:4806 fish/cmds.c:4827 fish/cmds.c:4847 fish/cmds.c:4866
+#: fish/cmds.c:4886 fish/cmds.c:4904 fish/cmds.c:4922 fish/cmds.c:4936
+#: fish/cmds.c:4952 fish/cmds.c:4972 fish/cmds.c:4991 fish/cmds.c:5010
+#: fish/cmds.c:5029 fish/cmds.c:5048 fish/cmds.c:5068 fish/cmds.c:5108
+#: fish/cmds.c:5165 fish/cmds.c:5186 fish/cmds.c:5207 fish/cmds.c:5228
+#: fish/cmds.c:5246 fish/cmds.c:5268 fish/cmds.c:5306 fish/cmds.c:5328
+#: fish/cmds.c:5407 fish/cmds.c:5446 fish/cmds.c:5461 fish/cmds.c:5478
+#: fish/cmds.c:5492 fish/cmds.c:5508 fish/cmds.c:5530 fish/cmds.c:5552
+#: fish/cmds.c:5574 fish/cmds.c:5596 fish/cmds.c:5618 fish/cmds.c:5640
+#: fish/cmds.c:5660 fish/cmds.c:5677 fish/cmds.c:5694 fish/cmds.c:5713
+#: fish/cmds.c:5732 fish/cmds.c:5752 fish/cmds.c:5788 fish/cmds.c:5807
+#: fish/cmds.c:5826 fish/cmds.c:5843 fish/cmds.c:5861 fish/cmds.c:5884
+#: fish/cmds.c:5907 fish/cmds.c:5931 fish/cmds.c:5954 fish/cmds.c:5975
+#: fish/cmds.c:5998 fish/cmds.c:6021 fish/cmds.c:6041 fish/cmds.c:6063
+#: fish/cmds.c:6084 fish/cmds.c:6107 fish/cmds.c:6124 fish/cmds.c:6141
+#: fish/cmds.c:6159 fish/cmds.c:6177 fish/cmds.c:6198 fish/cmds.c:6216
+#: fish/cmds.c:6237 fish/cmds.c:6257 fish/cmds.c:6275 fish/cmds.c:6296
+#: fish/cmds.c:6319 fish/cmds.c:6342 fish/cmds.c:6364 fish/cmds.c:6397
+#: fish/cmds.c:6414 fish/cmds.c:6431 fish/cmds.c:6455 fish/cmds.c:6478
+#: fish/cmds.c:6501 fish/cmds.c:6523 fish/cmds.c:6540 fish/cmds.c:6562
+#: fish/cmds.c:6656 fish/cmds.c:6676 fish/cmds.c:6696 fish/cmds.c:6716
+#: fish/cmds.c:6734 fish/cmds.c:6755 fish/cmds.c:6791 fish/cmds.c:6808
+#: fish/cmds.c:6830 fish/cmds.c:6847 fish/cmds.c:6883 fish/cmds.c:6903
+#: fish/cmds.c:6923 fish/cmds.c:6943 fish/cmds.c:6965 fish/cmds.c:6982
+#: fish/cmds.c:7001 fish/cmds.c:7020 fish/cmds.c:7042 fish/cmds.c:7063
+#: fish/cmds.c:7084 fish/cmds.c:7105 fish/cmds.c:7128 fish/cmds.c:7169
+#: fish/cmds.c:7192 fish/cmds.c:7231 fish/cmds.c:7248 fish/cmds.c:7267
+#: fish/cmds.c:7288 fish/cmds.c:7311 fish/cmds.c:7333 fish/cmds.c:7351
+#: fish/cmds.c:7370 fish/cmds.c:7391 fish/cmds.c:7468 fish/cmds.c:7509
+#: fish/cmds.c:7588 fish/cmds.c:7664 fish/cmds.c:7701 fish/cmds.c:7724
+#: fish/cmds.c:7745 fish/cmds.c:7768 fish/cmds.c:7790 fish/cmds.c:7815
+#: fish/cmds.c:7858 fish/cmds.c:7899 fish/cmds.c:7920 fish/cmds.c:7938
+#: fish/cmds.c:7957 fish/cmds.c:7974 fish/cmds.c:7992 fish/cmds.c:8019
+#: fish/cmds.c:8043 fish/cmds.c:8067 fish/cmds.c:8091 fish/cmds.c:8115
+#: fish/cmds.c:8139 fish/cmds.c:8163 fish/cmds.c:8187 fish/cmds.c:8211
+#: fish/cmds.c:8235 fish/cmds.c:8259 fish/cmds.c:8283 fish/cmds.c:8306
+#: fish/cmds.c:8329 fish/cmds.c:8350 fish/cmds.c:8371 fish/cmds.c:8392
+#: fish/cmds.c:8412 fish/cmds.c:8435 fish/cmds.c:8473 fish/cmds.c:8490
+#: fish/cmds.c:8507 fish/cmds.c:8526 fish/cmds.c:8545 fish/cmds.c:8562
+#: fish/cmds.c:8579 fish/cmds.c:8596 fish/cmds.c:8613 fish/cmds.c:8632
+#: fish/cmds.c:8668 fish/cmds.c:8708 fish/cmds.c:8741 fish/cmds.c:8758
+#: fish/cmds.c:8775 fish/cmds.c:8791 fish/cmds.c:8806 fish/cmds.c:8827
+#: fish/cmds.c:8865 fish/cmds.c:8903 fish/cmds.c:8942 fish/cmds.c:8982
+#: fish/cmds.c:9023 fish/cmds.c:9064 fish/cmds.c:9102 fish/cmds.c:9119
+#: fish/cmds.c:9142 fish/cmds.c:9164 fish/cmds.c:9186 fish/cmds.c:9206
+#: fish/cmds.c:9226 fish/cmds.c:9262 fish/cmds.c:9334 fish/cmds.c:9374
+#: fish/cmds.c:9432 fish/cmds.c:9458 fish/cmds.c:9484 fish/cmds.c:9512
+#: fish/cmds.c:9571 fish/cmds.c:9592 fish/cmds.c:9637 fish/cmds.c:9657
+#: fish/cmds.c:9696 fish/cmds.c:9733 fish/cmds.c:9753 fish/cmds.c:9775
+#: fish/cmds.c:9832 fish/cmds.c:9852 fish/cmds.c:9874 fish/cmds.c:9896
+#: fish/cmds.c:9915 fish/cmds.c:9935 fish/cmds.c:9962 fish/cmds.c:9982
+#: fish/cmds.c:10002 fish/cmds.c:10022 fish/cmds.c:10042 fish/cmds.c:10064
+#: fish/cmds.c:10099 fish/cmds.c:10117 fish/cmds.c:10140 fish/cmds.c:10162
+#: fish/cmds.c:10177 fish/cmds.c:10194 fish/cmds.c:10231 fish/cmds.c:10270
+#: fish/cmds.c:10310 fish/cmds.c:10366 fish/cmds.c:10388 fish/cmds.c:10424
+#: fish/cmds.c:10439 fish/cmds.c:10459 fish/cmds.c:10499 fish/cmds.c:10522
+#: fish/cmds.c:10546 fish/cmds.c:10571 fish/cmds.c:10612 fish/cmds.c:10637
+#: fish/cmds.c:10675 fish/cmds.c:10706 fish/cmds.c:10737 fish/cmds.c:10765
+#: fish/cmds.c:10785 fish/cmds.c:10817 fish/cmds.c:10837 fish/cmds.c:10857
+#: fish/cmds.c:10874 fish/cmds.c:10892 fish/cmds.c:10915 fish/cmds.c:10936
+#: fish/cmds.c:10955 fish/cmds.c:10997 fish/cmds.c:11040 fish/cmds.c:11084
+#: fish/cmds.c:11123 fish/cmds.c:11142 fish/cmds.c:11162 fish/cmds.c:11182
+#: fish/cmds.c:11203 fish/cmds.c:11224 fish/cmds.c:11245 fish/cmds.c:11266
+#: fish/cmds.c:11287 fish/cmds.c:11309 fish/cmds.c:11347 fish/cmds.c:11398
+#: fish/cmds.c:11436 fish/cmds.c:11492