-#: 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: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