-#: 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:3402 fish/cmds.c:3416 fish/cmds.c:3432 fish/cmds.c:3449
+#: fish/cmds.c:3466 fish/cmds.c:3484 fish/cmds.c:3503 fish/cmds.c:3519
+#: fish/cmds.c:3537 fish/cmds.c:3553 fish/cmds.c:3571 fish/cmds.c:3587
+#: fish/cmds.c:3604 fish/cmds.c:3619 fish/cmds.c:3637 fish/cmds.c:3652
+#: fish/cmds.c:3668 fish/cmds.c:3684 fish/cmds.c:3700 fish/cmds.c:3716
+#: fish/cmds.c:3732 fish/cmds.c:3750 fish/cmds.c:3783 fish/cmds.c:3799
+#: fish/cmds.c:3815 fish/cmds.c:3834 fish/cmds.c:3849 fish/cmds.c:3867
+#: fish/cmds.c:3882 fish/cmds.c:3900 fish/cmds.c:3915 fish/cmds.c:3933
+#: fish/cmds.c:3948 fish/cmds.c:3967 fish/cmds.c:3986 fish/cmds.c:4004
+#: fish/cmds.c:4024 fish/cmds.c:4043 fish/cmds.c:4063 fish/cmds.c:4083
+#: fish/cmds.c:4103 fish/cmds.c:4122 fish/cmds.c:4141 fish/cmds.c:4161
+#: fish/cmds.c:4181 fish/cmds.c:4201 fish/cmds.c:4216 fish/cmds.c:4232
+#: fish/cmds.c:4253 fish/cmds.c:4304 fish/cmds.c:4322 fish/cmds.c:4342
+#: fish/cmds.c:4358 fish/cmds.c:4374 fish/cmds.c:4393 fish/cmds.c:4415
+#: fish/cmds.c:4437 fish/cmds.c:4457 fish/cmds.c:4474 fish/cmds.c:4491
+#: fish/cmds.c:4508 fish/cmds.c:4525 fish/cmds.c:4542 fish/cmds.c:4559
+#: fish/cmds.c:4576 fish/cmds.c:4595 fish/cmds.c:4618 fish/cmds.c:4654
+#: fish/cmds.c:4671 fish/cmds.c:4694 fish/cmds.c:4716 fish/cmds.c:4737
+#: fish/cmds.c:4757 fish/cmds.c:4776 fish/cmds.c:4796 fish/cmds.c:4814
+#: fish/cmds.c:4832 fish/cmds.c:4846 fish/cmds.c:4862 fish/cmds.c:4882
+#: fish/cmds.c:4901 fish/cmds.c:4920 fish/cmds.c:4939 fish/cmds.c:4958
+#: fish/cmds.c:4978 fish/cmds.c:5018 fish/cmds.c:5075 fish/cmds.c:5096
+#: fish/cmds.c:5117 fish/cmds.c:5138 fish/cmds.c:5156 fish/cmds.c:5178
+#: fish/cmds.c:5216 fish/cmds.c:5238 fish/cmds.c:5317 fish/cmds.c:5356
+#: fish/cmds.c:5371 fish/cmds.c:5388 fish/cmds.c:5402 fish/cmds.c:5418
+#: fish/cmds.c:5440 fish/cmds.c:5462 fish/cmds.c:5484 fish/cmds.c:5506
+#: fish/cmds.c:5528 fish/cmds.c:5550 fish/cmds.c:5570 fish/cmds.c:5587
+#: fish/cmds.c:5604 fish/cmds.c:5623 fish/cmds.c:5642 fish/cmds.c:5662
+#: fish/cmds.c:5698 fish/cmds.c:5717 fish/cmds.c:5736 fish/cmds.c:5753
+#: fish/cmds.c:5771 fish/cmds.c:5794 fish/cmds.c:5817 fish/cmds.c:5841
+#: fish/cmds.c:5864 fish/cmds.c:5885 fish/cmds.c:5908 fish/cmds.c:5931
+#: fish/cmds.c:5951 fish/cmds.c:5973 fish/cmds.c:5994 fish/cmds.c:6017
+#: fish/cmds.c:6034 fish/cmds.c:6051 fish/cmds.c:6069 fish/cmds.c:6087
+#: fish/cmds.c:6108 fish/cmds.c:6126 fish/cmds.c:6147 fish/cmds.c:6167
+#: fish/cmds.c:6185 fish/cmds.c:6206 fish/cmds.c:6229 fish/cmds.c:6252
+#: fish/cmds.c:6274 fish/cmds.c:6307 fish/cmds.c:6324 fish/cmds.c:6341
+#: fish/cmds.c:6365 fish/cmds.c:6388 fish/cmds.c:6411 fish/cmds.c:6433
+#: fish/cmds.c:6450 fish/cmds.c:6472 fish/cmds.c:6566 fish/cmds.c:6586
+#: fish/cmds.c:6606 fish/cmds.c:6626 fish/cmds.c:6644 fish/cmds.c:6665
+#: fish/cmds.c:6701 fish/cmds.c:6718 fish/cmds.c:6740 fish/cmds.c:6757
+#: fish/cmds.c:6793 fish/cmds.c:6813 fish/cmds.c:6833 fish/cmds.c:6853
+#: fish/cmds.c:6875 fish/cmds.c:6892 fish/cmds.c:6911 fish/cmds.c:6930
+#: fish/cmds.c:6952 fish/cmds.c:6973 fish/cmds.c:6994 fish/cmds.c:7015
+#: fish/cmds.c:7038 fish/cmds.c:7079 fish/cmds.c:7102 fish/cmds.c:7141
+#: fish/cmds.c:7158 fish/cmds.c:7177 fish/cmds.c:7198 fish/cmds.c:7221
+#: fish/cmds.c:7243 fish/cmds.c:7261 fish/cmds.c:7280 fish/cmds.c:7301
+#: fish/cmds.c:7378 fish/cmds.c:7419 fish/cmds.c:7498 fish/cmds.c:7574
+#: fish/cmds.c:7611 fish/cmds.c:7634 fish/cmds.c:7655 fish/cmds.c:7678
+#: fish/cmds.c:7700 fish/cmds.c:7725 fish/cmds.c:7768 fish/cmds.c:7809
+#: fish/cmds.c:7830 fish/cmds.c:7848 fish/cmds.c:7867 fish/cmds.c:7884
+#: fish/cmds.c:7902 fish/cmds.c:7929 fish/cmds.c:7953 fish/cmds.c:7977
+#: fish/cmds.c:8001 fish/cmds.c:8025 fish/cmds.c:8049 fish/cmds.c:8073
+#: fish/cmds.c:8097 fish/cmds.c:8121 fish/cmds.c:8145 fish/cmds.c:8169
+#: fish/cmds.c:8193 fish/cmds.c:8216 fish/cmds.c:8239 fish/cmds.c:8260
+#: fish/cmds.c:8281 fish/cmds.c:8302 fish/cmds.c:8322 fish/cmds.c:8345
+#: fish/cmds.c:8383 fish/cmds.c:8400 fish/cmds.c:8417 fish/cmds.c:8436
+#: fish/cmds.c:8455 fish/cmds.c:8472 fish/cmds.c:8489 fish/cmds.c:8506
+#: fish/cmds.c:8523 fish/cmds.c:8542 fish/cmds.c:8578 fish/cmds.c:8618
+#: fish/cmds.c:8651 fish/cmds.c:8668 fish/cmds.c:8685 fish/cmds.c:8701
+#: fish/cmds.c:8716 fish/cmds.c:8737 fish/cmds.c:8775 fish/cmds.c:8813
+#: fish/cmds.c:8852 fish/cmds.c:8892 fish/cmds.c:8933 fish/cmds.c:8974
+#: fish/cmds.c:9012 fish/cmds.c:9029 fish/cmds.c:9052 fish/cmds.c:9074
+#: fish/cmds.c:9096 fish/cmds.c:9116 fish/cmds.c:9136 fish/cmds.c:9172
+#: fish/cmds.c:9244 fish/cmds.c:9284 fish/cmds.c:9342 fish/cmds.c:9368
+#: fish/cmds.c:9394 fish/cmds.c:9422 fish/cmds.c:9481 fish/cmds.c:9502
+#: fish/cmds.c:9547 fish/cmds.c:9567 fish/cmds.c:9606 fish/cmds.c:9643
+#: fish/cmds.c:9663 fish/cmds.c:9685 fish/cmds.c:9742 fish/cmds.c:9762
+#: fish/cmds.c:9784 fish/cmds.c:9806 fish/cmds.c:9825 fish/cmds.c:9845
+#: fish/cmds.c:9872 fish/cmds.c:9892 fish/cmds.c:9912 fish/cmds.c:9932
+#: fish/cmds.c:9952 fish/cmds.c:9974 fish/cmds.c:10009 fish/cmds.c:10027
+#: fish/cmds.c:10050 fish/cmds.c:10072 fish/cmds.c:10087 fish/cmds.c:10104
+#: fish/cmds.c:10141 fish/cmds.c:10180 fish/cmds.c:10220 fish/cmds.c:10276
+#: fish/cmds.c:10298 fish/cmds.c:10334 fish/cmds.c:10349 fish/cmds.c:10369
+#: fish/cmds.c:10409 fish/cmds.c:10432 fish/cmds.c:10456 fish/cmds.c:10481
+#: fish/cmds.c:10522 fish/cmds.c:10547 fish/cmds.c:10585 fish/cmds.c:10616
+#: fish/cmds.c:10647 fish/cmds.c:10675 fish/cmds.c:10695 fish/cmds.c:10727
+#: fish/cmds.c:10747 fish/cmds.c:10767 fish/cmds.c:10784 fish/cmds.c:10802
+#: fish/cmds.c:10825 fish/cmds.c:10846 fish/cmds.c:10865 fish/cmds.c:10907
+#: fish/cmds.c:10950 fish/cmds.c:10994 fish/cmds.c:11033 fish/cmds.c:11052
+#: fish/cmds.c:11072 fish/cmds.c:11092 fish/cmds.c:11113 fish/cmds.c:11134
+#: fish/cmds.c:11155 fish/cmds.c:11176 fish/cmds.c:11197 fish/cmds.c:11219
+#: fish/cmds.c:11257 fish/cmds.c:11308 fish/cmds.c:11346 fish/cmds.c:11402