-#: fish/cmds.c:2372 fish/cmds.c:2385 fish/cmds.c:2400 fish/cmds.c:2416
-#: fish/cmds.c:2432 fish/cmds.c:2449 fish/cmds.c:2467 fish/cmds.c:2482
-#: fish/cmds.c:2499 fish/cmds.c:2514 fish/cmds.c:2531 fish/cmds.c:2546
-#: fish/cmds.c:2562 fish/cmds.c:2576 fish/cmds.c:2593 fish/cmds.c:2607
-#: fish/cmds.c:2622 fish/cmds.c:2637 fish/cmds.c:2652 fish/cmds.c:2667
-#: fish/cmds.c:2682 fish/cmds.c:2699 fish/cmds.c:2731 fish/cmds.c:2746
-#: fish/cmds.c:2761 fish/cmds.c:2779 fish/cmds.c:2793 fish/cmds.c:2810
-#: fish/cmds.c:2824 fish/cmds.c:2841 fish/cmds.c:2855 fish/cmds.c:2872
-#: fish/cmds.c:2886 fish/cmds.c:2904 fish/cmds.c:2922 fish/cmds.c:2939
-#: fish/cmds.c:2958 fish/cmds.c:2976 fish/cmds.c:2995 fish/cmds.c:3014
-#: fish/cmds.c:3033 fish/cmds.c:3051 fish/cmds.c:3069 fish/cmds.c:3088
-#: fish/cmds.c:3107 fish/cmds.c:3126 fish/cmds.c:3140 fish/cmds.c:3155
-#: fish/cmds.c:3175 fish/cmds.c:3225 fish/cmds.c:3245 fish/cmds.c:3260
-#: fish/cmds.c:3275 fish/cmds.c:3293 fish/cmds.c:3314 fish/cmds.c:3335
-#: fish/cmds.c:3354 fish/cmds.c:3370 fish/cmds.c:3386 fish/cmds.c:3402
-#: fish/cmds.c:3418 fish/cmds.c:3434 fish/cmds.c:3450 fish/cmds.c:3466
-#: fish/cmds.c:3484 fish/cmds.c:3506 fish/cmds.c:3541 fish/cmds.c:3557
-#: fish/cmds.c:3579 fish/cmds.c:3600 fish/cmds.c:3620 fish/cmds.c:3639
-#: fish/cmds.c:3657 fish/cmds.c:3676 fish/cmds.c:3693 fish/cmds.c:3710
-#: fish/cmds.c:3723 fish/cmds.c:3738 fish/cmds.c:3757 fish/cmds.c:3775
-#: fish/cmds.c:3793 fish/cmds.c:3811 fish/cmds.c:3829 fish/cmds.c:3848
-#: fish/cmds.c:3887 fish/cmds.c:3943 fish/cmds.c:3963 fish/cmds.c:3983
-#: fish/cmds.c:4003 fish/cmds.c:4020 fish/cmds.c:4041 fish/cmds.c:4078
-#: fish/cmds.c:4099 fish/cmds.c:4177 fish/cmds.c:4215 fish/cmds.c:4229
-#: fish/cmds.c:4245 fish/cmds.c:4258 fish/cmds.c:4273 fish/cmds.c:4294
-#: fish/cmds.c:4315 fish/cmds.c:4336 fish/cmds.c:4357 fish/cmds.c:4378
-#: fish/cmds.c:4399 fish/cmds.c:4418 fish/cmds.c:4434 fish/cmds.c:4450
-#: fish/cmds.c:4468 fish/cmds.c:4486 fish/cmds.c:4505 fish/cmds.c:4540
-#: fish/cmds.c:4558 fish/cmds.c:4576 fish/cmds.c:4592 fish/cmds.c:4609
-#: fish/cmds.c:4631 fish/cmds.c:4653 fish/cmds.c:4676 fish/cmds.c:4698
-#: fish/cmds.c:4718 fish/cmds.c:4740 fish/cmds.c:4762 fish/cmds.c:4781
-#: fish/cmds.c:4802 fish/cmds.c:4822 fish/cmds.c:4844 fish/cmds.c:4860
-#: fish/cmds.c:4876 fish/cmds.c:4893 fish/cmds.c:4910 fish/cmds.c:4930
-#: fish/cmds.c:4947 fish/cmds.c:4967 fish/cmds.c:4986 fish/cmds.c:5003
-#: fish/cmds.c:5023 fish/cmds.c:5045 fish/cmds.c:5067 fish/cmds.c:5088
-#: fish/cmds.c:5120 fish/cmds.c:5136 fish/cmds.c:5152 fish/cmds.c:5175
-#: fish/cmds.c:5197 fish/cmds.c:5219 fish/cmds.c:5240 fish/cmds.c:5256
-#: fish/cmds.c:5277 fish/cmds.c:5370 fish/cmds.c:5389 fish/cmds.c:5408
-#: fish/cmds.c:5427 fish/cmds.c:5444 fish/cmds.c:5464 fish/cmds.c:5499
-#: fish/cmds.c:5515 fish/cmds.c:5536 fish/cmds.c:5552 fish/cmds.c:5587
-#: fish/cmds.c:5606 fish/cmds.c:5625 fish/cmds.c:5644 fish/cmds.c:5665
-#: fish/cmds.c:5681 fish/cmds.c:5699 fish/cmds.c:5717 fish/cmds.c:5738
-#: fish/cmds.c:5758 fish/cmds.c:5778 fish/cmds.c:5798 fish/cmds.c:5820
-#: fish/cmds.c:5860 fish/cmds.c:5882 fish/cmds.c:5920 fish/cmds.c:5936
-#: fish/cmds.c:5954 fish/cmds.c:5974 fish/cmds.c:5996 fish/cmds.c:6017
-#: fish/cmds.c:6034 fish/cmds.c:6052 fish/cmds.c:6072 fish/cmds.c:6148
-#: fish/cmds.c:6188 fish/cmds.c:6266 fish/cmds.c:6341 fish/cmds.c:6377
-#: fish/cmds.c:6399 fish/cmds.c:6419 fish/cmds.c:6441 fish/cmds.c:6462
-#: fish/cmds.c:6486 fish/cmds.c:6528 fish/cmds.c:6568 fish/cmds.c:6588
-#: fish/cmds.c:6605 fish/cmds.c:6623 fish/cmds.c:6639 fish/cmds.c:6656
-#: fish/cmds.c:6682 fish/cmds.c:6705 fish/cmds.c:6728 fish/cmds.c:6751
-#: fish/cmds.c:6774 fish/cmds.c:6797 fish/cmds.c:6820 fish/cmds.c:6843
-#: fish/cmds.c:6866 fish/cmds.c:6889 fish/cmds.c:6912 fish/cmds.c:6935
-#: fish/cmds.c:6957 fish/cmds.c:6979 fish/cmds.c:6999 fish/cmds.c:7019
-#: fish/cmds.c:7039 fish/cmds.c:7058 fish/cmds.c:7080 fish/cmds.c:7117
-#: fish/cmds.c:7133 fish/cmds.c:7149 fish/cmds.c:7167 fish/cmds.c:7185
-#: fish/cmds.c:7201 fish/cmds.c:7217 fish/cmds.c:7233 fish/cmds.c:7249
-#: fish/cmds.c:7267 fish/cmds.c:7302 fish/cmds.c:7341 fish/cmds.c:7373
-#: fish/cmds.c:7389 fish/cmds.c:7405 fish/cmds.c:7420 fish/cmds.c:7434
-#: fish/cmds.c:7454 fish/cmds.c:7491 fish/cmds.c:7528 fish/cmds.c:7566
-#: fish/cmds.c:7605 fish/cmds.c:7645 fish/cmds.c:7685 fish/cmds.c:7722
-#: fish/cmds.c:7738 fish/cmds.c:7760 fish/cmds.c:7781 fish/cmds.c:7802
-#: fish/cmds.c:7821 fish/cmds.c:7840 fish/cmds.c:7875 fish/cmds.c:7946
-#: fish/cmds.c:7985 fish/cmds.c:8042 fish/cmds.c:8067 fish/cmds.c:8092
-#: fish/cmds.c:8119 fish/cmds.c:8177 fish/cmds.c:8197 fish/cmds.c:8241
-#: fish/cmds.c:8260 fish/cmds.c:8298 fish/cmds.c:8334 fish/cmds.c:8353
-#: fish/cmds.c:8374 fish/cmds.c:8430 fish/cmds.c:8449 fish/cmds.c:8470
-#: fish/cmds.c:8491 fish/cmds.c:8509 fish/cmds.c:8528 fish/cmds.c:8554
-#: fish/cmds.c:8573 fish/cmds.c:8592 fish/cmds.c:8611 fish/cmds.c:8630
-#: fish/cmds.c:8651 fish/cmds.c:8685 fish/cmds.c:8702 fish/cmds.c:8724
-#: fish/cmds.c:8745 fish/cmds.c:8759 fish/cmds.c:8775 fish/cmds.c:8811
-#: fish/cmds.c:8849 fish/cmds.c:8888 fish/cmds.c:8943 fish/cmds.c:8964
-#: fish/cmds.c:8999 fish/cmds.c:9013 fish/cmds.c:9032 fish/cmds.c:9071
-#: fish/cmds.c:9093 fish/cmds.c:9116 fish/cmds.c:9140 fish/cmds.c:9180
-#: fish/cmds.c:9204 fish/cmds.c:9241 fish/cmds.c:9271 fish/cmds.c:9301
-#: fish/cmds.c:9328 fish/cmds.c:9347 fish/cmds.c:9378 fish/cmds.c:9397
-#: fish/cmds.c:9416 fish/cmds.c:9432 fish/cmds.c:9449 fish/cmds.c:9471
-#: fish/cmds.c:9491 fish/cmds.c:9509 fish/cmds.c:9550 fish/cmds.c:9592
-#: fish/cmds.c:9635 fish/cmds.c:9673 fish/cmds.c:9691 fish/cmds.c:9710
-#: fish/cmds.c:9729 fish/cmds.c:9749 fish/cmds.c:9769 fish/cmds.c:9789
-#: fish/cmds.c:9809 fish/cmds.c:9829 fish/cmds.c:9850 fish/cmds.c:9887
-#: fish/cmds.c:9937 fish/cmds.c:9974 fish/cmds.c:10029
+#: 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