-#: 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:3438 fish/cmds.c:3452 fish/cmds.c:3468 fish/cmds.c:3485
+#: fish/cmds.c:3502 fish/cmds.c:3520 fish/cmds.c:3539 fish/cmds.c:3555
+#: fish/cmds.c:3573 fish/cmds.c:3589 fish/cmds.c:3607 fish/cmds.c:3623
+#: fish/cmds.c:3640 fish/cmds.c:3655 fish/cmds.c:3673 fish/cmds.c:3688
+#: fish/cmds.c:3704 fish/cmds.c:3720 fish/cmds.c:3736 fish/cmds.c:3752
+#: fish/cmds.c:3768 fish/cmds.c:3786 fish/cmds.c:3819 fish/cmds.c:3835
+#: fish/cmds.c:3851 fish/cmds.c:3870 fish/cmds.c:3885 fish/cmds.c:3903
+#: fish/cmds.c:3918 fish/cmds.c:3936 fish/cmds.c:3951 fish/cmds.c:3969
+#: fish/cmds.c:3984 fish/cmds.c:4003 fish/cmds.c:4022 fish/cmds.c:4040
+#: fish/cmds.c:4060 fish/cmds.c:4079 fish/cmds.c:4099 fish/cmds.c:4119
+#: fish/cmds.c:4139 fish/cmds.c:4158 fish/cmds.c:4177 fish/cmds.c:4197
+#: fish/cmds.c:4217 fish/cmds.c:4237 fish/cmds.c:4252 fish/cmds.c:4268
+#: fish/cmds.c:4289 fish/cmds.c:4340 fish/cmds.c:4358 fish/cmds.c:4375
+#: fish/cmds.c:4396 fish/cmds.c:4449 fish/cmds.c:4469 fish/cmds.c:4490
+#: fish/cmds.c:4506 fish/cmds.c:4522 fish/cmds.c:4541 fish/cmds.c:4563
+#: fish/cmds.c:4585 fish/cmds.c:4605 fish/cmds.c:4622 fish/cmds.c:4639
+#: fish/cmds.c:4656 fish/cmds.c:4673 fish/cmds.c:4690 fish/cmds.c:4707
+#: fish/cmds.c:4724 fish/cmds.c:4743 fish/cmds.c:4766 fish/cmds.c:4802
+#: fish/cmds.c:4819 fish/cmds.c:4842 fish/cmds.c:4864 fish/cmds.c:4885
+#: fish/cmds.c:4905 fish/cmds.c:4924 fish/cmds.c:4944 fish/cmds.c:4962
+#: fish/cmds.c:4980 fish/cmds.c:4994 fish/cmds.c:5010 fish/cmds.c:5030
+#: fish/cmds.c:5049 fish/cmds.c:5068 fish/cmds.c:5087 fish/cmds.c:5106
+#: fish/cmds.c:5126 fish/cmds.c:5166 fish/cmds.c:5223 fish/cmds.c:5244
+#: fish/cmds.c:5265 fish/cmds.c:5286 fish/cmds.c:5304 fish/cmds.c:5326
+#: fish/cmds.c:5364 fish/cmds.c:5386 fish/cmds.c:5465 fish/cmds.c:5504
+#: fish/cmds.c:5519 fish/cmds.c:5536 fish/cmds.c:5550 fish/cmds.c:5566
+#: fish/cmds.c:5588 fish/cmds.c:5610 fish/cmds.c:5632 fish/cmds.c:5654
+#: fish/cmds.c:5676 fish/cmds.c:5698 fish/cmds.c:5718 fish/cmds.c:5735
+#: fish/cmds.c:5752 fish/cmds.c:5771 fish/cmds.c:5790 fish/cmds.c:5810
+#: fish/cmds.c:5846 fish/cmds.c:5865 fish/cmds.c:5884 fish/cmds.c:5901
+#: fish/cmds.c:5919 fish/cmds.c:5942 fish/cmds.c:5965 fish/cmds.c:5989
+#: fish/cmds.c:6012 fish/cmds.c:6033 fish/cmds.c:6056 fish/cmds.c:6079
+#: fish/cmds.c:6099 fish/cmds.c:6121 fish/cmds.c:6142 fish/cmds.c:6165
+#: fish/cmds.c:6182 fish/cmds.c:6199 fish/cmds.c:6217 fish/cmds.c:6235
+#: fish/cmds.c:6256 fish/cmds.c:6274 fish/cmds.c:6295 fish/cmds.c:6315
+#: fish/cmds.c:6333 fish/cmds.c:6354 fish/cmds.c:6377 fish/cmds.c:6400
+#: fish/cmds.c:6422 fish/cmds.c:6455 fish/cmds.c:6472 fish/cmds.c:6489
+#: fish/cmds.c:6513 fish/cmds.c:6536 fish/cmds.c:6559 fish/cmds.c:6581
+#: fish/cmds.c:6598 fish/cmds.c:6620 fish/cmds.c:6714 fish/cmds.c:6734
+#: fish/cmds.c:6754 fish/cmds.c:6774 fish/cmds.c:6792 fish/cmds.c:6813
+#: fish/cmds.c:6849 fish/cmds.c:6866 fish/cmds.c:6888 fish/cmds.c:6905
+#: fish/cmds.c:6941 fish/cmds.c:6961 fish/cmds.c:6981 fish/cmds.c:7001
+#: fish/cmds.c:7023 fish/cmds.c:7040 fish/cmds.c:7059 fish/cmds.c:7078
+#: fish/cmds.c:7100 fish/cmds.c:7121 fish/cmds.c:7142 fish/cmds.c:7163
+#: fish/cmds.c:7186 fish/cmds.c:7227 fish/cmds.c:7250 fish/cmds.c:7289
+#: fish/cmds.c:7306 fish/cmds.c:7325 fish/cmds.c:7346 fish/cmds.c:7369
+#: fish/cmds.c:7391 fish/cmds.c:7409 fish/cmds.c:7428 fish/cmds.c:7449
+#: fish/cmds.c:7526 fish/cmds.c:7567 fish/cmds.c:7646 fish/cmds.c:7722
+#: fish/cmds.c:7759 fish/cmds.c:7782 fish/cmds.c:7803 fish/cmds.c:7826
+#: fish/cmds.c:7848 fish/cmds.c:7873 fish/cmds.c:7916 fish/cmds.c:7957
+#: fish/cmds.c:7978 fish/cmds.c:7996 fish/cmds.c:8015 fish/cmds.c:8032
+#: fish/cmds.c:8050 fish/cmds.c:8077 fish/cmds.c:8101 fish/cmds.c:8125
+#: fish/cmds.c:8149 fish/cmds.c:8173 fish/cmds.c:8197 fish/cmds.c:8221
+#: fish/cmds.c:8245 fish/cmds.c:8269 fish/cmds.c:8293 fish/cmds.c:8317
+#: fish/cmds.c:8341 fish/cmds.c:8364 fish/cmds.c:8387 fish/cmds.c:8408
+#: fish/cmds.c:8429 fish/cmds.c:8450 fish/cmds.c:8470 fish/cmds.c:8493
+#: fish/cmds.c:8531 fish/cmds.c:8548 fish/cmds.c:8565 fish/cmds.c:8584
+#: fish/cmds.c:8603 fish/cmds.c:8620 fish/cmds.c:8637 fish/cmds.c:8654
+#: fish/cmds.c:8671 fish/cmds.c:8690 fish/cmds.c:8726 fish/cmds.c:8766
+#: fish/cmds.c:8799 fish/cmds.c:8816 fish/cmds.c:8833 fish/cmds.c:8849
+#: fish/cmds.c:8864 fish/cmds.c:8885 fish/cmds.c:8923 fish/cmds.c:8961
+#: fish/cmds.c:9000 fish/cmds.c:9040 fish/cmds.c:9081 fish/cmds.c:9122
+#: fish/cmds.c:9160 fish/cmds.c:9177 fish/cmds.c:9200 fish/cmds.c:9222
+#: fish/cmds.c:9244 fish/cmds.c:9264 fish/cmds.c:9284 fish/cmds.c:9320
+#: fish/cmds.c:9392 fish/cmds.c:9432 fish/cmds.c:9490 fish/cmds.c:9516
+#: fish/cmds.c:9542 fish/cmds.c:9570 fish/cmds.c:9629 fish/cmds.c:9650
+#: fish/cmds.c:9695 fish/cmds.c:9715 fish/cmds.c:9754 fish/cmds.c:9791
+#: fish/cmds.c:9811 fish/cmds.c:9833 fish/cmds.c:9890 fish/cmds.c:9910
+#: fish/cmds.c:9932 fish/cmds.c:9954 fish/cmds.c:9973 fish/cmds.c:9993
+#: fish/cmds.c:10020 fish/cmds.c:10040 fish/cmds.c:10060 fish/cmds.c:10080
+#: fish/cmds.c:10100 fish/cmds.c:10122 fish/cmds.c:10157 fish/cmds.c:10175
+#: fish/cmds.c:10198 fish/cmds.c:10220 fish/cmds.c:10235 fish/cmds.c:10252
+#: fish/cmds.c:10289 fish/cmds.c:10328 fish/cmds.c:10368 fish/cmds.c:10424
+#: fish/cmds.c:10446 fish/cmds.c:10482 fish/cmds.c:10497 fish/cmds.c:10517
+#: fish/cmds.c:10557 fish/cmds.c:10580 fish/cmds.c:10604 fish/cmds.c:10629
+#: fish/cmds.c:10670 fish/cmds.c:10695 fish/cmds.c:10733 fish/cmds.c:10764
+#: fish/cmds.c:10795 fish/cmds.c:10823 fish/cmds.c:10843 fish/cmds.c:10875
+#: fish/cmds.c:10895 fish/cmds.c:10915 fish/cmds.c:10932 fish/cmds.c:10950
+#: fish/cmds.c:10973 fish/cmds.c:10994 fish/cmds.c:11013 fish/cmds.c:11055
+#: fish/cmds.c:11098 fish/cmds.c:11142 fish/cmds.c:11181 fish/cmds.c:11200
+#: fish/cmds.c:11220 fish/cmds.c:11240 fish/cmds.c:11261 fish/cmds.c:11282
+#: fish/cmds.c:11303 fish/cmds.c:11324 fish/cmds.c:11345 fish/cmds.c:11367
+#: fish/cmds.c:11405 fish/cmds.c:11456 fish/cmds.c:11494 fish/cmds.c:11550