-#: 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:3392 fish/cmds.c:3406 fish/cmds.c:3422 fish/cmds.c:3439
+#: fish/cmds.c:3456 fish/cmds.c:3474 fish/cmds.c:3493 fish/cmds.c:3509
+#: fish/cmds.c:3527 fish/cmds.c:3543 fish/cmds.c:3561 fish/cmds.c:3577
+#: fish/cmds.c:3594 fish/cmds.c:3609 fish/cmds.c:3627 fish/cmds.c:3642
+#: fish/cmds.c:3658 fish/cmds.c:3674 fish/cmds.c:3690 fish/cmds.c:3706
+#: fish/cmds.c:3722 fish/cmds.c:3740 fish/cmds.c:3773 fish/cmds.c:3789
+#: fish/cmds.c:3805 fish/cmds.c:3824 fish/cmds.c:3839 fish/cmds.c:3857
+#: fish/cmds.c:3872 fish/cmds.c:3890 fish/cmds.c:3905 fish/cmds.c:3923
+#: fish/cmds.c:3938 fish/cmds.c:3957 fish/cmds.c:3976 fish/cmds.c:3994
+#: fish/cmds.c:4014 fish/cmds.c:4033 fish/cmds.c:4053 fish/cmds.c:4073
+#: fish/cmds.c:4093 fish/cmds.c:4112 fish/cmds.c:4131 fish/cmds.c:4151
+#: fish/cmds.c:4171 fish/cmds.c:4191 fish/cmds.c:4206 fish/cmds.c:4222
+#: fish/cmds.c:4243 fish/cmds.c:4294 fish/cmds.c:4315 fish/cmds.c:4331
+#: fish/cmds.c:4347 fish/cmds.c:4366 fish/cmds.c:4388 fish/cmds.c:4410
+#: fish/cmds.c:4430 fish/cmds.c:4447 fish/cmds.c:4464 fish/cmds.c:4481
+#: fish/cmds.c:4498 fish/cmds.c:4515 fish/cmds.c:4532 fish/cmds.c:4549
+#: fish/cmds.c:4568 fish/cmds.c:4591 fish/cmds.c:4627 fish/cmds.c:4644
+#: fish/cmds.c:4667 fish/cmds.c:4689 fish/cmds.c:4710 fish/cmds.c:4730
+#: fish/cmds.c:4749 fish/cmds.c:4769 fish/cmds.c:4787 fish/cmds.c:4805
+#: fish/cmds.c:4819 fish/cmds.c:4835 fish/cmds.c:4855 fish/cmds.c:4874
+#: fish/cmds.c:4893 fish/cmds.c:4912 fish/cmds.c:4931 fish/cmds.c:4951
+#: fish/cmds.c:4991 fish/cmds.c:5048 fish/cmds.c:5069 fish/cmds.c:5090
+#: fish/cmds.c:5111 fish/cmds.c:5129 fish/cmds.c:5151 fish/cmds.c:5189
+#: fish/cmds.c:5211 fish/cmds.c:5290 fish/cmds.c:5329 fish/cmds.c:5344
+#: fish/cmds.c:5361 fish/cmds.c:5375 fish/cmds.c:5391 fish/cmds.c:5413
+#: fish/cmds.c:5435 fish/cmds.c:5457 fish/cmds.c:5479 fish/cmds.c:5501
+#: fish/cmds.c:5523 fish/cmds.c:5543 fish/cmds.c:5560 fish/cmds.c:5577
+#: fish/cmds.c:5596 fish/cmds.c:5615 fish/cmds.c:5635 fish/cmds.c:5671
+#: fish/cmds.c:5690 fish/cmds.c:5709 fish/cmds.c:5726 fish/cmds.c:5744
+#: fish/cmds.c:5767 fish/cmds.c:5790 fish/cmds.c:5814 fish/cmds.c:5837
+#: fish/cmds.c:5858 fish/cmds.c:5881 fish/cmds.c:5904 fish/cmds.c:5924
+#: fish/cmds.c:5946 fish/cmds.c:5967 fish/cmds.c:5990 fish/cmds.c:6007
+#: fish/cmds.c:6024 fish/cmds.c:6042 fish/cmds.c:6060 fish/cmds.c:6081
+#: fish/cmds.c:6099 fish/cmds.c:6120 fish/cmds.c:6140 fish/cmds.c:6158
+#: fish/cmds.c:6179 fish/cmds.c:6202 fish/cmds.c:6225 fish/cmds.c:6247
+#: fish/cmds.c:6280 fish/cmds.c:6297 fish/cmds.c:6314 fish/cmds.c:6338
+#: fish/cmds.c:6361 fish/cmds.c:6384 fish/cmds.c:6406 fish/cmds.c:6423
+#: fish/cmds.c:6445 fish/cmds.c:6539 fish/cmds.c:6559 fish/cmds.c:6579
+#: fish/cmds.c:6599 fish/cmds.c:6617 fish/cmds.c:6638 fish/cmds.c:6674
+#: fish/cmds.c:6691 fish/cmds.c:6713 fish/cmds.c:6730 fish/cmds.c:6766
+#: fish/cmds.c:6786 fish/cmds.c:6806 fish/cmds.c:6826 fish/cmds.c:6848
+#: fish/cmds.c:6865 fish/cmds.c:6884 fish/cmds.c:6903 fish/cmds.c:6925
+#: fish/cmds.c:6946 fish/cmds.c:6967 fish/cmds.c:6988 fish/cmds.c:7011
+#: fish/cmds.c:7052 fish/cmds.c:7075 fish/cmds.c:7114 fish/cmds.c:7131
+#: fish/cmds.c:7150 fish/cmds.c:7171 fish/cmds.c:7194 fish/cmds.c:7216
+#: fish/cmds.c:7234 fish/cmds.c:7253 fish/cmds.c:7274 fish/cmds.c:7351
+#: fish/cmds.c:7392 fish/cmds.c:7471 fish/cmds.c:7547 fish/cmds.c:7584
+#: fish/cmds.c:7607 fish/cmds.c:7628 fish/cmds.c:7651 fish/cmds.c:7673
+#: fish/cmds.c:7698 fish/cmds.c:7741 fish/cmds.c:7782 fish/cmds.c:7803
+#: fish/cmds.c:7821 fish/cmds.c:7840 fish/cmds.c:7857 fish/cmds.c:7875
+#: fish/cmds.c:7902 fish/cmds.c:7926 fish/cmds.c:7950 fish/cmds.c:7974
+#: fish/cmds.c:7998 fish/cmds.c:8022 fish/cmds.c:8046 fish/cmds.c:8070
+#: fish/cmds.c:8094 fish/cmds.c:8118 fish/cmds.c:8142 fish/cmds.c:8166
+#: fish/cmds.c:8189 fish/cmds.c:8212 fish/cmds.c:8233 fish/cmds.c:8254
+#: fish/cmds.c:8275 fish/cmds.c:8295 fish/cmds.c:8318 fish/cmds.c:8356
+#: fish/cmds.c:8373 fish/cmds.c:8390 fish/cmds.c:8409 fish/cmds.c:8428
+#: fish/cmds.c:8445 fish/cmds.c:8462 fish/cmds.c:8479 fish/cmds.c:8496
+#: fish/cmds.c:8515 fish/cmds.c:8551 fish/cmds.c:8591 fish/cmds.c:8624
+#: fish/cmds.c:8641 fish/cmds.c:8658 fish/cmds.c:8674 fish/cmds.c:8689
+#: fish/cmds.c:8710 fish/cmds.c:8748 fish/cmds.c:8786 fish/cmds.c:8825
+#: fish/cmds.c:8865 fish/cmds.c:8906 fish/cmds.c:8947 fish/cmds.c:8985
+#: fish/cmds.c:9002 fish/cmds.c:9025 fish/cmds.c:9047 fish/cmds.c:9069
+#: fish/cmds.c:9089 fish/cmds.c:9109 fish/cmds.c:9145 fish/cmds.c:9217
+#: fish/cmds.c:9257 fish/cmds.c:9315 fish/cmds.c:9341 fish/cmds.c:9367
+#: fish/cmds.c:9395 fish/cmds.c:9454 fish/cmds.c:9475 fish/cmds.c:9520
+#: fish/cmds.c:9540 fish/cmds.c:9579 fish/cmds.c:9616 fish/cmds.c:9636
+#: fish/cmds.c:9658 fish/cmds.c:9715 fish/cmds.c:9735 fish/cmds.c:9757
+#: fish/cmds.c:9779 fish/cmds.c:9798 fish/cmds.c:9818 fish/cmds.c:9845
+#: fish/cmds.c:9865 fish/cmds.c:9885 fish/cmds.c:9905 fish/cmds.c:9925
+#: fish/cmds.c:9947 fish/cmds.c:9982 fish/cmds.c:10000 fish/cmds.c:10023
+#: fish/cmds.c:10045 fish/cmds.c:10060 fish/cmds.c:10077 fish/cmds.c:10114
+#: fish/cmds.c:10153 fish/cmds.c:10193 fish/cmds.c:10249 fish/cmds.c:10271
+#: fish/cmds.c:10307 fish/cmds.c:10322 fish/cmds.c:10342 fish/cmds.c:10382
+#: fish/cmds.c:10405 fish/cmds.c:10429 fish/cmds.c:10454 fish/cmds.c:10495
+#: fish/cmds.c:10520 fish/cmds.c:10558 fish/cmds.c:10589 fish/cmds.c:10620
+#: fish/cmds.c:10648 fish/cmds.c:10668 fish/cmds.c:10700 fish/cmds.c:10720
+#: fish/cmds.c:10740 fish/cmds.c:10757 fish/cmds.c:10775 fish/cmds.c:10798
+#: fish/cmds.c:10819 fish/cmds.c:10838 fish/cmds.c:10880 fish/cmds.c:10923
+#: fish/cmds.c:10967 fish/cmds.c:11006 fish/cmds.c:11025 fish/cmds.c:11045
+#: fish/cmds.c:11065 fish/cmds.c:11086 fish/cmds.c:11107 fish/cmds.c:11128
+#: fish/cmds.c:11149 fish/cmds.c:11170 fish/cmds.c:11192 fish/cmds.c:11230
+#: fish/cmds.c:11281 fish/cmds.c:11319 fish/cmds.c:11375