-#: fish/cmds.c:2347 fish/cmds.c:2359 fish/cmds.c:2372 fish/cmds.c:2387
-#: fish/cmds.c:2402 fish/cmds.c:2418 fish/cmds.c:2435 fish/cmds.c:2450
-#: fish/cmds.c:2465 fish/cmds.c:2480 fish/cmds.c:2495 fish/cmds.c:2510
-#: fish/cmds.c:2524 fish/cmds.c:2538 fish/cmds.c:2553 fish/cmds.c:2567
-#: fish/cmds.c:2581 fish/cmds.c:2595 fish/cmds.c:2609 fish/cmds.c:2623
-#: fish/cmds.c:2637 fish/cmds.c:2652 fish/cmds.c:2684 fish/cmds.c:2698
-#: fish/cmds.c:2712 fish/cmds.c:2728 fish/cmds.c:2742 fish/cmds.c:2757
-#: fish/cmds.c:2771 fish/cmds.c:2786 fish/cmds.c:2800 fish/cmds.c:2815
-#: fish/cmds.c:2829 fish/cmds.c:2845 fish/cmds.c:2862 fish/cmds.c:2878
-#: fish/cmds.c:2897 fish/cmds.c:2913 fish/cmds.c:2931 fish/cmds.c:2949
-#: fish/cmds.c:2967 fish/cmds.c:2984 fish/cmds.c:3001 fish/cmds.c:3019
-#: fish/cmds.c:3037 fish/cmds.c:3055 fish/cmds.c:3069 fish/cmds.c:3083
-#: fish/cmds.c:3100 fish/cmds.c:3115 fish/cmds.c:3128 fish/cmds.c:3145
-#: fish/cmds.c:3165 fish/cmds.c:3185 fish/cmds.c:3204 fish/cmds.c:3219
-#: fish/cmds.c:3234 fish/cmds.c:3249 fish/cmds.c:3264 fish/cmds.c:3279
-#: fish/cmds.c:3294 fish/cmds.c:3309 fish/cmds.c:3325 fish/cmds.c:3346
-#: fish/cmds.c:3381 fish/cmds.c:3395 fish/cmds.c:3416 fish/cmds.c:3436
-#: fish/cmds.c:3455 fish/cmds.c:3473 fish/cmds.c:3490 fish/cmds.c:3508
-#: fish/cmds.c:3524 fish/cmds.c:3541 fish/cmds.c:3553 fish/cmds.c:3566
-#: fish/cmds.c:3584 fish/cmds.c:3601 fish/cmds.c:3618 fish/cmds.c:3635
-#: fish/cmds.c:3652 fish/cmds.c:3670 fish/cmds.c:3708 fish/cmds.c:3763
-#: fish/cmds.c:3782 fish/cmds.c:3801 fish/cmds.c:3820 fish/cmds.c:3836
-#: fish/cmds.c:3856 fish/cmds.c:3892 fish/cmds.c:3912 fish/cmds.c:3989
-#: fish/cmds.c:4026 fish/cmds.c:4040 fish/cmds.c:4055 fish/cmds.c:4067
-#: fish/cmds.c:4080 fish/cmds.c:4100 fish/cmds.c:4120 fish/cmds.c:4140
-#: fish/cmds.c:4160 fish/cmds.c:4180 fish/cmds.c:4200 fish/cmds.c:4218
-#: fish/cmds.c:4233 fish/cmds.c:4248 fish/cmds.c:4265 fish/cmds.c:4282
-#: fish/cmds.c:4300 fish/cmds.c:4334 fish/cmds.c:4351 fish/cmds.c:4368
-#: fish/cmds.c:4383 fish/cmds.c:4399 fish/cmds.c:4420 fish/cmds.c:4441
-#: fish/cmds.c:4463 fish/cmds.c:4484 fish/cmds.c:4503 fish/cmds.c:4524
-#: fish/cmds.c:4545 fish/cmds.c:4563 fish/cmds.c:4583 fish/cmds.c:4602
-#: fish/cmds.c:4623 fish/cmds.c:4638 fish/cmds.c:4653 fish/cmds.c:4669
-#: fish/cmds.c:4685 fish/cmds.c:4704 fish/cmds.c:4720 fish/cmds.c:4739
-#: fish/cmds.c:4757 fish/cmds.c:4773 fish/cmds.c:4792 fish/cmds.c:4813
-#: fish/cmds.c:4834 fish/cmds.c:4854 fish/cmds.c:4886 fish/cmds.c:4901
-#: fish/cmds.c:4915 fish/cmds.c:4937 fish/cmds.c:4958 fish/cmds.c:4979
-#: fish/cmds.c:4999 fish/cmds.c:5014 fish/cmds.c:5034 fish/cmds.c:5126
-#: fish/cmds.c:5144 fish/cmds.c:5162 fish/cmds.c:5180 fish/cmds.c:5196
-#: fish/cmds.c:5215 fish/cmds.c:5249 fish/cmds.c:5264 fish/cmds.c:5284
-#: fish/cmds.c:5299 fish/cmds.c:5333 fish/cmds.c:5351 fish/cmds.c:5369
-#: fish/cmds.c:5387 fish/cmds.c:5407 fish/cmds.c:5422 fish/cmds.c:5439
-#: fish/cmds.c:5456 fish/cmds.c:5476 fish/cmds.c:5495 fish/cmds.c:5514
-#: fish/cmds.c:5533 fish/cmds.c:5554 fish/cmds.c:5593 fish/cmds.c:5614
-#: fish/cmds.c:5652 fish/cmds.c:5667 fish/cmds.c:5683 fish/cmds.c:5702
-#: fish/cmds.c:5723 fish/cmds.c:5743 fish/cmds.c:5759 fish/cmds.c:5776
-#: fish/cmds.c:5795 fish/cmds.c:5870 fish/cmds.c:5909 fish/cmds.c:5986
-#: fish/cmds.c:6060 fish/cmds.c:6095 fish/cmds.c:6116 fish/cmds.c:6135
-#: fish/cmds.c:6156 fish/cmds.c:6176 fish/cmds.c:6199 fish/cmds.c:6240
-#: fish/cmds.c:6279 fish/cmds.c:6298 fish/cmds.c:6315 fish/cmds.c:6331
-#: fish/cmds.c:6346 fish/cmds.c:6362 fish/cmds.c:6387 fish/cmds.c:6409
-#: fish/cmds.c:6431 fish/cmds.c:6453 fish/cmds.c:6475 fish/cmds.c:6497
-#: fish/cmds.c:6519 fish/cmds.c:6541 fish/cmds.c:6563 fish/cmds.c:6585
-#: fish/cmds.c:6607 fish/cmds.c:6629 fish/cmds.c:6650 fish/cmds.c:6671
-#: fish/cmds.c:6690 fish/cmds.c:6709 fish/cmds.c:6728 fish/cmds.c:6746
-#: fish/cmds.c:6767 fish/cmds.c:6803 fish/cmds.c:6818 fish/cmds.c:6833
-#: fish/cmds.c:6850 fish/cmds.c:6867 fish/cmds.c:6882 fish/cmds.c:6897
-#: fish/cmds.c:6912 fish/cmds.c:6927 fish/cmds.c:6944 fish/cmds.c:6978
-#: fish/cmds.c:7016 fish/cmds.c:7048 fish/cmds.c:7063 fish/cmds.c:7078
-#: fish/cmds.c:7091 fish/cmds.c:7105 fish/cmds.c:7123 fish/cmds.c:7159
-#: fish/cmds.c:7195 fish/cmds.c:7232 fish/cmds.c:7270 fish/cmds.c:7309
-#: fish/cmds.c:7348 fish/cmds.c:7384 fish/cmds.c:7399 fish/cmds.c:7420
-#: fish/cmds.c:7440 fish/cmds.c:7460 fish/cmds.c:7478 fish/cmds.c:7496
-#: fish/cmds.c:7530 fish/cmds.c:7600 fish/cmds.c:7638 fish/cmds.c:7694
-#: fish/cmds.c:7718 fish/cmds.c:7742 fish/cmds.c:7768 fish/cmds.c:7825
-#: fish/cmds.c:7844 fish/cmds.c:7887 fish/cmds.c:7905 fish/cmds.c:7942
-#: fish/cmds.c:7977 fish/cmds.c:7995 fish/cmds.c:8015 fish/cmds.c:8070
-#: fish/cmds.c:8088 fish/cmds.c:8108 fish/cmds.c:8128 fish/cmds.c:8145
-#: fish/cmds.c:8163 fish/cmds.c:8188 fish/cmds.c:8206 fish/cmds.c:8224
-#: fish/cmds.c:8242 fish/cmds.c:8260 fish/cmds.c:8280 fish/cmds.c:8313
-#: fish/cmds.c:8329 fish/cmds.c:8350 fish/cmds.c:8370 fish/cmds.c:8384
-#: fish/cmds.c:8398 fish/cmds.c:8433 fish/cmds.c:8470 fish/cmds.c:8508
-#: fish/cmds.c:8562 fish/cmds.c:8582 fish/cmds.c:8616 fish/cmds.c:8630
-#: fish/cmds.c:8647 fish/cmds.c:8685 fish/cmds.c:8706 fish/cmds.c:8728
-#: fish/cmds.c:8751 fish/cmds.c:8790 fish/cmds.c:8813 fish/cmds.c:8849
-#: fish/cmds.c:8878 fish/cmds.c:8907 fish/cmds.c:8934 fish/cmds.c:8951
-#: fish/cmds.c:8981 fish/cmds.c:8999 fish/cmds.c:9017 fish/cmds.c:9033
-#: fish/cmds.c:9048 fish/cmds.c:9069 fish/cmds.c:9088 fish/cmds.c:9105
-#: fish/cmds.c:9145 fish/cmds.c:9186 fish/cmds.c:9228 fish/cmds.c:9265
-#: fish/cmds.c:9282 fish/cmds.c:9300 fish/cmds.c:9318 fish/cmds.c:9337
-#: fish/cmds.c:9356 fish/cmds.c:9375 fish/cmds.c:9394 fish/cmds.c:9413
-#: fish/cmds.c:9433 fish/cmds.c:9469 fish/cmds.c:9518
+#: 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