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