-#: 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:3474 fish/cmds.c:3488 fish/cmds.c:3504 fish/cmds.c:3521
+#: fish/cmds.c:3538 fish/cmds.c:3556 fish/cmds.c:3575 fish/cmds.c:3591
+#: fish/cmds.c:3609 fish/cmds.c:3625 fish/cmds.c:3643 fish/cmds.c:3659
+#: fish/cmds.c:3676 fish/cmds.c:3691 fish/cmds.c:3709 fish/cmds.c:3724
+#: fish/cmds.c:3740 fish/cmds.c:3756 fish/cmds.c:3772 fish/cmds.c:3788
+#: fish/cmds.c:3804 fish/cmds.c:3822 fish/cmds.c:3855 fish/cmds.c:3871
+#: fish/cmds.c:3887 fish/cmds.c:3906 fish/cmds.c:3921 fish/cmds.c:3939
+#: fish/cmds.c:3954 fish/cmds.c:3972 fish/cmds.c:3987 fish/cmds.c:4005
+#: fish/cmds.c:4020 fish/cmds.c:4039 fish/cmds.c:4058 fish/cmds.c:4076
+#: fish/cmds.c:4096 fish/cmds.c:4115 fish/cmds.c:4135 fish/cmds.c:4155
+#: fish/cmds.c:4175 fish/cmds.c:4194 fish/cmds.c:4213 fish/cmds.c:4233
+#: fish/cmds.c:4253 fish/cmds.c:4273 fish/cmds.c:4288 fish/cmds.c:4304
+#: fish/cmds.c:4325 fish/cmds.c:4376 fish/cmds.c:4394 fish/cmds.c:4411
+#: fish/cmds.c:4432 fish/cmds.c:4485 fish/cmds.c:4505 fish/cmds.c:4525
+#: fish/cmds.c:4546 fish/cmds.c:4562 fish/cmds.c:4578 fish/cmds.c:4597
+#: fish/cmds.c:4619 fish/cmds.c:4641 fish/cmds.c:4661 fish/cmds.c:4678
+#: fish/cmds.c:4695 fish/cmds.c:4712 fish/cmds.c:4729 fish/cmds.c:4746
+#: fish/cmds.c:4763 fish/cmds.c:4780 fish/cmds.c:4799 fish/cmds.c:4822
+#: fish/cmds.c:4858 fish/cmds.c:4875 fish/cmds.c:4898 fish/cmds.c:4920
+#: fish/cmds.c:4941 fish/cmds.c:4961 fish/cmds.c:4980 fish/cmds.c:5000
+#: fish/cmds.c:5018 fish/cmds.c:5036 fish/cmds.c:5050 fish/cmds.c:5066
+#: fish/cmds.c:5086 fish/cmds.c:5105 fish/cmds.c:5124 fish/cmds.c:5143
+#: fish/cmds.c:5162 fish/cmds.c:5182 fish/cmds.c:5222 fish/cmds.c:5279
+#: fish/cmds.c:5300 fish/cmds.c:5321 fish/cmds.c:5342 fish/cmds.c:5360
+#: fish/cmds.c:5382 fish/cmds.c:5420 fish/cmds.c:5442 fish/cmds.c:5521
+#: fish/cmds.c:5560 fish/cmds.c:5575 fish/cmds.c:5592 fish/cmds.c:5606
+#: fish/cmds.c:5622 fish/cmds.c:5644 fish/cmds.c:5666 fish/cmds.c:5688
+#: fish/cmds.c:5710 fish/cmds.c:5732 fish/cmds.c:5754 fish/cmds.c:5774
+#: fish/cmds.c:5791 fish/cmds.c:5808 fish/cmds.c:5827 fish/cmds.c:5846
+#: fish/cmds.c:5866 fish/cmds.c:5902 fish/cmds.c:5921 fish/cmds.c:5940
+#: fish/cmds.c:5957 fish/cmds.c:5975 fish/cmds.c:5998 fish/cmds.c:6021
+#: fish/cmds.c:6045 fish/cmds.c:6068 fish/cmds.c:6089 fish/cmds.c:6112
+#: fish/cmds.c:6135 fish/cmds.c:6155 fish/cmds.c:6177 fish/cmds.c:6198
+#: fish/cmds.c:6221 fish/cmds.c:6238 fish/cmds.c:6255 fish/cmds.c:6273
+#: fish/cmds.c:6291 fish/cmds.c:6312 fish/cmds.c:6330 fish/cmds.c:6351
+#: fish/cmds.c:6371 fish/cmds.c:6389 fish/cmds.c:6410 fish/cmds.c:6433
+#: fish/cmds.c:6456 fish/cmds.c:6478 fish/cmds.c:6511 fish/cmds.c:6528
+#: fish/cmds.c:6545 fish/cmds.c:6569 fish/cmds.c:6592 fish/cmds.c:6615
+#: fish/cmds.c:6637 fish/cmds.c:6654 fish/cmds.c:6676 fish/cmds.c:6770
+#: fish/cmds.c:6790 fish/cmds.c:6810 fish/cmds.c:6830 fish/cmds.c:6848
+#: fish/cmds.c:6869 fish/cmds.c:6905 fish/cmds.c:6922 fish/cmds.c:6944
+#: fish/cmds.c:6961 fish/cmds.c:6997 fish/cmds.c:7017 fish/cmds.c:7037
+#: fish/cmds.c:7057 fish/cmds.c:7079 fish/cmds.c:7096 fish/cmds.c:7115
+#: fish/cmds.c:7134 fish/cmds.c:7156 fish/cmds.c:7177 fish/cmds.c:7198
+#: fish/cmds.c:7219 fish/cmds.c:7242 fish/cmds.c:7283 fish/cmds.c:7306
+#: fish/cmds.c:7345 fish/cmds.c:7362 fish/cmds.c:7381 fish/cmds.c:7402
+#: fish/cmds.c:7425 fish/cmds.c:7447 fish/cmds.c:7465 fish/cmds.c:7484
+#: fish/cmds.c:7505 fish/cmds.c:7582 fish/cmds.c:7623 fish/cmds.c:7702
+#: fish/cmds.c:7778 fish/cmds.c:7815 fish/cmds.c:7838 fish/cmds.c:7859
+#: fish/cmds.c:7882 fish/cmds.c:7904 fish/cmds.c:7929 fish/cmds.c:7972
+#: fish/cmds.c:8013 fish/cmds.c:8034 fish/cmds.c:8052 fish/cmds.c:8071
+#: fish/cmds.c:8088 fish/cmds.c:8106 fish/cmds.c:8133 fish/cmds.c:8157
+#: fish/cmds.c:8181 fish/cmds.c:8205 fish/cmds.c:8229 fish/cmds.c:8253
+#: fish/cmds.c:8277 fish/cmds.c:8301 fish/cmds.c:8325 fish/cmds.c:8349
+#: fish/cmds.c:8373 fish/cmds.c:8397 fish/cmds.c:8420 fish/cmds.c:8443
+#: fish/cmds.c:8464 fish/cmds.c:8485 fish/cmds.c:8506 fish/cmds.c:8526
+#: fish/cmds.c:8549 fish/cmds.c:8587 fish/cmds.c:8604 fish/cmds.c:8621
+#: fish/cmds.c:8640 fish/cmds.c:8659 fish/cmds.c:8676 fish/cmds.c:8693
+#: fish/cmds.c:8710 fish/cmds.c:8727 fish/cmds.c:8746 fish/cmds.c:8782
+#: fish/cmds.c:8822 fish/cmds.c:8855 fish/cmds.c:8872 fish/cmds.c:8889
+#: fish/cmds.c:8905 fish/cmds.c:8920 fish/cmds.c:8941 fish/cmds.c:8979
+#: fish/cmds.c:9017 fish/cmds.c:9056 fish/cmds.c:9096 fish/cmds.c:9137
+#: fish/cmds.c:9178 fish/cmds.c:9216 fish/cmds.c:9233 fish/cmds.c:9256
+#: fish/cmds.c:9278 fish/cmds.c:9300 fish/cmds.c:9320 fish/cmds.c:9340
+#: fish/cmds.c:9376 fish/cmds.c:9448 fish/cmds.c:9488 fish/cmds.c:9546
+#: fish/cmds.c:9572 fish/cmds.c:9598 fish/cmds.c:9626 fish/cmds.c:9685
+#: fish/cmds.c:9706 fish/cmds.c:9751 fish/cmds.c:9771 fish/cmds.c:9810
+#: fish/cmds.c:9847 fish/cmds.c:9867 fish/cmds.c:9889 fish/cmds.c:9946
+#: fish/cmds.c:9966 fish/cmds.c:9988 fish/cmds.c:10010 fish/cmds.c:10029
+#: fish/cmds.c:10049 fish/cmds.c:10076 fish/cmds.c:10096 fish/cmds.c:10116
+#: fish/cmds.c:10136 fish/cmds.c:10156 fish/cmds.c:10178 fish/cmds.c:10213
+#: fish/cmds.c:10231 fish/cmds.c:10254 fish/cmds.c:10276 fish/cmds.c:10291
+#: fish/cmds.c:10308 fish/cmds.c:10345 fish/cmds.c:10384 fish/cmds.c:10424
+#: fish/cmds.c:10480 fish/cmds.c:10502 fish/cmds.c:10538 fish/cmds.c:10553
+#: fish/cmds.c:10573 fish/cmds.c:10613 fish/cmds.c:10636 fish/cmds.c:10660
+#: fish/cmds.c:10685 fish/cmds.c:10726 fish/cmds.c:10751 fish/cmds.c:10789
+#: fish/cmds.c:10820 fish/cmds.c:10851 fish/cmds.c:10879 fish/cmds.c:10899
+#: fish/cmds.c:10931 fish/cmds.c:10951 fish/cmds.c:10971 fish/cmds.c:10988
+#: fish/cmds.c:11006 fish/cmds.c:11029 fish/cmds.c:11050 fish/cmds.c:11069
+#: fish/cmds.c:11111 fish/cmds.c:11154 fish/cmds.c:11198 fish/cmds.c:11237
+#: fish/cmds.c:11256 fish/cmds.c:11276 fish/cmds.c:11296 fish/cmds.c:11317
+#: fish/cmds.c:11338 fish/cmds.c:11359 fish/cmds.c:11380 fish/cmds.c:11401
+#: fish/cmds.c:11423 fish/cmds.c:11461 fish/cmds.c:11512 fish/cmds.c:11550
+#: fish/cmds.c:11606