-#: fish/cmds.c:2341 fish/cmds.c:2353 fish/cmds.c:2366 fish/cmds.c:2381
-#: fish/cmds.c:2396 fish/cmds.c:2412 fish/cmds.c:2429 fish/cmds.c:2444
-#: fish/cmds.c:2459 fish/cmds.c:2474 fish/cmds.c:2489 fish/cmds.c:2504
-#: fish/cmds.c:2518 fish/cmds.c:2532 fish/cmds.c:2547 fish/cmds.c:2561
-#: fish/cmds.c:2575 fish/cmds.c:2589 fish/cmds.c:2603 fish/cmds.c:2617
-#: fish/cmds.c:2631 fish/cmds.c:2646 fish/cmds.c:2678 fish/cmds.c:2692
-#: fish/cmds.c:2706 fish/cmds.c:2722 fish/cmds.c:2736 fish/cmds.c:2751
-#: fish/cmds.c:2765 fish/cmds.c:2780 fish/cmds.c:2794 fish/cmds.c:2809
-#: fish/cmds.c:2823 fish/cmds.c:2839 fish/cmds.c:2856 fish/cmds.c:2872
-#: fish/cmds.c:2891 fish/cmds.c:2907 fish/cmds.c:2925 fish/cmds.c:2943
-#: fish/cmds.c:2961 fish/cmds.c:2978 fish/cmds.c:2995 fish/cmds.c:3013
-#: fish/cmds.c:3031 fish/cmds.c:3049 fish/cmds.c:3063 fish/cmds.c:3077
-#: fish/cmds.c:3094 fish/cmds.c:3109 fish/cmds.c:3122 fish/cmds.c:3139
-#: fish/cmds.c:3159 fish/cmds.c:3179 fish/cmds.c:3198 fish/cmds.c:3213
-#: fish/cmds.c:3228 fish/cmds.c:3243 fish/cmds.c:3258 fish/cmds.c:3273
-#: fish/cmds.c:3288 fish/cmds.c:3303 fish/cmds.c:3319 fish/cmds.c:3340
-#: fish/cmds.c:3375 fish/cmds.c:3389 fish/cmds.c:3410 fish/cmds.c:3430
-#: fish/cmds.c:3449 fish/cmds.c:3467 fish/cmds.c:3484 fish/cmds.c:3502
-#: fish/cmds.c:3518 fish/cmds.c:3535 fish/cmds.c:3547 fish/cmds.c:3560
-#: fish/cmds.c:3578 fish/cmds.c:3595 fish/cmds.c:3612 fish/cmds.c:3629
-#: fish/cmds.c:3646 fish/cmds.c:3664 fish/cmds.c:3702 fish/cmds.c:3757
-#: fish/cmds.c:3776 fish/cmds.c:3795 fish/cmds.c:3814 fish/cmds.c:3830
-#: fish/cmds.c:3850 fish/cmds.c:3886 fish/cmds.c:3906 fish/cmds.c:3983
-#: fish/cmds.c:4020 fish/cmds.c:4034 fish/cmds.c:4049 fish/cmds.c:4061
-#: fish/cmds.c:4074 fish/cmds.c:4094 fish/cmds.c:4114 fish/cmds.c:4134
-#: fish/cmds.c:4154 fish/cmds.c:4174 fish/cmds.c:4194 fish/cmds.c:4212
-#: fish/cmds.c:4227 fish/cmds.c:4242 fish/cmds.c:4259 fish/cmds.c:4276
-#: fish/cmds.c:4294 fish/cmds.c:4328 fish/cmds.c:4345 fish/cmds.c:4362
-#: fish/cmds.c:4377 fish/cmds.c:4393 fish/cmds.c:4414 fish/cmds.c:4435
-#: fish/cmds.c:4457 fish/cmds.c:4478 fish/cmds.c:4497 fish/cmds.c:4518
-#: fish/cmds.c:4539 fish/cmds.c:4557 fish/cmds.c:4577 fish/cmds.c:4596
-#: fish/cmds.c:4617 fish/cmds.c:4632 fish/cmds.c:4647 fish/cmds.c:4663
-#: fish/cmds.c:4679 fish/cmds.c:4698 fish/cmds.c:4714 fish/cmds.c:4733
-#: fish/cmds.c:4751 fish/cmds.c:4767 fish/cmds.c:4786 fish/cmds.c:4807
-#: fish/cmds.c:4828 fish/cmds.c:4848 fish/cmds.c:4880 fish/cmds.c:4895
-#: fish/cmds.c:4909 fish/cmds.c:4931 fish/cmds.c:4952 fish/cmds.c:4973
-#: fish/cmds.c:4993 fish/cmds.c:5008 fish/cmds.c:5028 fish/cmds.c:5120
-#: fish/cmds.c:5138 fish/cmds.c:5156 fish/cmds.c:5174 fish/cmds.c:5190
-#: fish/cmds.c:5209 fish/cmds.c:5243 fish/cmds.c:5258 fish/cmds.c:5278
-#: fish/cmds.c:5293 fish/cmds.c:5327 fish/cmds.c:5345 fish/cmds.c:5363
-#: fish/cmds.c:5381 fish/cmds.c:5401 fish/cmds.c:5416 fish/cmds.c:5433
-#: fish/cmds.c:5450 fish/cmds.c:5470 fish/cmds.c:5489 fish/cmds.c:5508
-#: fish/cmds.c:5527 fish/cmds.c:5548 fish/cmds.c:5587 fish/cmds.c:5608
-#: fish/cmds.c:5646 fish/cmds.c:5661 fish/cmds.c:5677 fish/cmds.c:5696
-#: fish/cmds.c:5717 fish/cmds.c:5737 fish/cmds.c:5753 fish/cmds.c:5770
-#: fish/cmds.c:5789 fish/cmds.c:5864 fish/cmds.c:5903 fish/cmds.c:5980
-#: fish/cmds.c:6054 fish/cmds.c:6089 fish/cmds.c:6110 fish/cmds.c:6129
-#: fish/cmds.c:6150 fish/cmds.c:6170 fish/cmds.c:6193 fish/cmds.c:6234
-#: fish/cmds.c:6273 fish/cmds.c:6292 fish/cmds.c:6309 fish/cmds.c:6325
-#: fish/cmds.c:6340 fish/cmds.c:6356 fish/cmds.c:6381 fish/cmds.c:6403
-#: fish/cmds.c:6425 fish/cmds.c:6447 fish/cmds.c:6469 fish/cmds.c:6491
-#: fish/cmds.c:6513 fish/cmds.c:6535 fish/cmds.c:6557 fish/cmds.c:6579
-#: fish/cmds.c:6601 fish/cmds.c:6623 fish/cmds.c:6644 fish/cmds.c:6665
-#: fish/cmds.c:6684 fish/cmds.c:6703 fish/cmds.c:6722 fish/cmds.c:6740
-#: fish/cmds.c:6761 fish/cmds.c:6797 fish/cmds.c:6812 fish/cmds.c:6827
-#: fish/cmds.c:6844 fish/cmds.c:6861 fish/cmds.c:6876 fish/cmds.c:6891
-#: fish/cmds.c:6906 fish/cmds.c:6921 fish/cmds.c:6938 fish/cmds.c:6972
-#: fish/cmds.c:7010 fish/cmds.c:7042 fish/cmds.c:7057 fish/cmds.c:7072
-#: fish/cmds.c:7085 fish/cmds.c:7099 fish/cmds.c:7117 fish/cmds.c:7153
-#: fish/cmds.c:7189 fish/cmds.c:7226 fish/cmds.c:7264 fish/cmds.c:7303
-#: fish/cmds.c:7342 fish/cmds.c:7378 fish/cmds.c:7393 fish/cmds.c:7414
-#: fish/cmds.c:7434 fish/cmds.c:7454 fish/cmds.c:7472 fish/cmds.c:7490
-#: fish/cmds.c:7524 fish/cmds.c:7594 fish/cmds.c:7632 fish/cmds.c:7688
-#: fish/cmds.c:7712 fish/cmds.c:7736 fish/cmds.c:7762 fish/cmds.c:7819
-#: fish/cmds.c:7838 fish/cmds.c:7881 fish/cmds.c:7899 fish/cmds.c:7936
-#: fish/cmds.c:7971 fish/cmds.c:7989 fish/cmds.c:8009 fish/cmds.c:8064
-#: fish/cmds.c:8082 fish/cmds.c:8102 fish/cmds.c:8122 fish/cmds.c:8139
-#: fish/cmds.c:8157 fish/cmds.c:8182 fish/cmds.c:8200 fish/cmds.c:8218
-#: fish/cmds.c:8236 fish/cmds.c:8254 fish/cmds.c:8274 fish/cmds.c:8307
-#: fish/cmds.c:8323 fish/cmds.c:8344 fish/cmds.c:8364 fish/cmds.c:8378
-#: fish/cmds.c:8392 fish/cmds.c:8427 fish/cmds.c:8464 fish/cmds.c:8502
-#: fish/cmds.c:8556 fish/cmds.c:8576 fish/cmds.c:8610 fish/cmds.c:8624
-#: fish/cmds.c:8641 fish/cmds.c:8679 fish/cmds.c:8700 fish/cmds.c:8722
-#: fish/cmds.c:8745 fish/cmds.c:8784 fish/cmds.c:8807 fish/cmds.c:8843
-#: fish/cmds.c:8872 fish/cmds.c:8901 fish/cmds.c:8928 fish/cmds.c:8945
-#: fish/cmds.c:8975 fish/cmds.c:8993 fish/cmds.c:9011 fish/cmds.c:9027
-#: fish/cmds.c:9042 fish/cmds.c:9063 fish/cmds.c:9082 fish/cmds.c:9099
-#: fish/cmds.c:9139 fish/cmds.c:9180 fish/cmds.c:9222 fish/cmds.c:9259
-#: fish/cmds.c:9276 fish/cmds.c:9294 fish/cmds.c:9312 fish/cmds.c:9331
-#: fish/cmds.c:9350 fish/cmds.c:9369 fish/cmds.c:9388 fish/cmds.c:9407
-#: fish/cmds.c:9427 fish/cmds.c:9463
+#: 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