-#: 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:3393 fish/cmds.c:3407 fish/cmds.c:3423 fish/cmds.c:3440
+#: fish/cmds.c:3457 fish/cmds.c:3475 fish/cmds.c:3494 fish/cmds.c:3510
+#: fish/cmds.c:3528 fish/cmds.c:3544 fish/cmds.c:3562 fish/cmds.c:3578
+#: fish/cmds.c:3595 fish/cmds.c:3610 fish/cmds.c:3628 fish/cmds.c:3643
+#: fish/cmds.c:3659 fish/cmds.c:3675 fish/cmds.c:3691 fish/cmds.c:3707
+#: fish/cmds.c:3723 fish/cmds.c:3741 fish/cmds.c:3774 fish/cmds.c:3790
+#: fish/cmds.c:3806 fish/cmds.c:3825 fish/cmds.c:3840 fish/cmds.c:3858
+#: fish/cmds.c:3873 fish/cmds.c:3891 fish/cmds.c:3906 fish/cmds.c:3924
+#: fish/cmds.c:3939 fish/cmds.c:3958 fish/cmds.c:3977 fish/cmds.c:3995
+#: fish/cmds.c:4015 fish/cmds.c:4034 fish/cmds.c:4054 fish/cmds.c:4074
+#: fish/cmds.c:4094 fish/cmds.c:4113 fish/cmds.c:4132 fish/cmds.c:4152
+#: fish/cmds.c:4172 fish/cmds.c:4192 fish/cmds.c:4207 fish/cmds.c:4223
+#: fish/cmds.c:4244 fish/cmds.c:4295 fish/cmds.c:4316 fish/cmds.c:4332
+#: fish/cmds.c:4348 fish/cmds.c:4367 fish/cmds.c:4389 fish/cmds.c:4411
+#: fish/cmds.c:4431 fish/cmds.c:4448 fish/cmds.c:4465 fish/cmds.c:4482
+#: fish/cmds.c:4499 fish/cmds.c:4516 fish/cmds.c:4533 fish/cmds.c:4550
+#: fish/cmds.c:4569 fish/cmds.c:4592 fish/cmds.c:4628 fish/cmds.c:4645
+#: fish/cmds.c:4668 fish/cmds.c:4690 fish/cmds.c:4711 fish/cmds.c:4731
+#: fish/cmds.c:4750 fish/cmds.c:4770 fish/cmds.c:4788 fish/cmds.c:4806
+#: fish/cmds.c:4820 fish/cmds.c:4836 fish/cmds.c:4856 fish/cmds.c:4875
+#: fish/cmds.c:4894 fish/cmds.c:4913 fish/cmds.c:4932 fish/cmds.c:4952
+#: fish/cmds.c:4992 fish/cmds.c:5049 fish/cmds.c:5070 fish/cmds.c:5091
+#: fish/cmds.c:5112 fish/cmds.c:5130 fish/cmds.c:5152 fish/cmds.c:5190
+#: fish/cmds.c:5212 fish/cmds.c:5291 fish/cmds.c:5330 fish/cmds.c:5345
+#: fish/cmds.c:5362 fish/cmds.c:5376 fish/cmds.c:5392 fish/cmds.c:5414
+#: fish/cmds.c:5436 fish/cmds.c:5458 fish/cmds.c:5480 fish/cmds.c:5502
+#: fish/cmds.c:5524 fish/cmds.c:5544 fish/cmds.c:5561 fish/cmds.c:5578
+#: fish/cmds.c:5597 fish/cmds.c:5616 fish/cmds.c:5636 fish/cmds.c:5672
+#: fish/cmds.c:5691 fish/cmds.c:5710 fish/cmds.c:5727 fish/cmds.c:5745
+#: fish/cmds.c:5768 fish/cmds.c:5791 fish/cmds.c:5815 fish/cmds.c:5838
+#: fish/cmds.c:5859 fish/cmds.c:5882 fish/cmds.c:5905 fish/cmds.c:5925
+#: fish/cmds.c:5947 fish/cmds.c:5968 fish/cmds.c:5991 fish/cmds.c:6008
+#: fish/cmds.c:6025 fish/cmds.c:6043 fish/cmds.c:6061 fish/cmds.c:6082
+#: fish/cmds.c:6100 fish/cmds.c:6121 fish/cmds.c:6141 fish/cmds.c:6159
+#: fish/cmds.c:6180 fish/cmds.c:6203 fish/cmds.c:6226 fish/cmds.c:6248
+#: fish/cmds.c:6281 fish/cmds.c:6298 fish/cmds.c:6315 fish/cmds.c:6339
+#: fish/cmds.c:6362 fish/cmds.c:6385 fish/cmds.c:6407 fish/cmds.c:6424
+#: fish/cmds.c:6446 fish/cmds.c:6540 fish/cmds.c:6560 fish/cmds.c:6580
+#: fish/cmds.c:6600 fish/cmds.c:6618 fish/cmds.c:6639 fish/cmds.c:6675
+#: fish/cmds.c:6692 fish/cmds.c:6714 fish/cmds.c:6731 fish/cmds.c:6767
+#: fish/cmds.c:6787 fish/cmds.c:6807 fish/cmds.c:6827 fish/cmds.c:6849
+#: fish/cmds.c:6866 fish/cmds.c:6885 fish/cmds.c:6904 fish/cmds.c:6926
+#: fish/cmds.c:6947 fish/cmds.c:6968 fish/cmds.c:6989 fish/cmds.c:7012
+#: fish/cmds.c:7053 fish/cmds.c:7076 fish/cmds.c:7115 fish/cmds.c:7132
+#: fish/cmds.c:7151 fish/cmds.c:7172 fish/cmds.c:7195 fish/cmds.c:7217
+#: fish/cmds.c:7235 fish/cmds.c:7254 fish/cmds.c:7275 fish/cmds.c:7352
+#: fish/cmds.c:7393 fish/cmds.c:7472 fish/cmds.c:7548 fish/cmds.c:7585
+#: fish/cmds.c:7608 fish/cmds.c:7629 fish/cmds.c:7652 fish/cmds.c:7674
+#: fish/cmds.c:7699 fish/cmds.c:7742 fish/cmds.c:7783 fish/cmds.c:7804
+#: fish/cmds.c:7822 fish/cmds.c:7841 fish/cmds.c:7858 fish/cmds.c:7876
+#: fish/cmds.c:7903 fish/cmds.c:7927 fish/cmds.c:7951 fish/cmds.c:7975
+#: fish/cmds.c:7999 fish/cmds.c:8023 fish/cmds.c:8047 fish/cmds.c:8071
+#: fish/cmds.c:8095 fish/cmds.c:8119 fish/cmds.c:8143 fish/cmds.c:8167
+#: fish/cmds.c:8190 fish/cmds.c:8213 fish/cmds.c:8234 fish/cmds.c:8255
+#: fish/cmds.c:8276 fish/cmds.c:8296 fish/cmds.c:8319 fish/cmds.c:8357
+#: fish/cmds.c:8374 fish/cmds.c:8391 fish/cmds.c:8410 fish/cmds.c:8429
+#: fish/cmds.c:8446 fish/cmds.c:8463 fish/cmds.c:8480 fish/cmds.c:8497
+#: fish/cmds.c:8516 fish/cmds.c:8552 fish/cmds.c:8592 fish/cmds.c:8625
+#: fish/cmds.c:8642 fish/cmds.c:8659 fish/cmds.c:8675 fish/cmds.c:8690
+#: fish/cmds.c:8711 fish/cmds.c:8749 fish/cmds.c:8787 fish/cmds.c:8826
+#: fish/cmds.c:8866 fish/cmds.c:8907 fish/cmds.c:8948 fish/cmds.c:8986
+#: fish/cmds.c:9003 fish/cmds.c:9026 fish/cmds.c:9048 fish/cmds.c:9070
+#: fish/cmds.c:9090 fish/cmds.c:9110 fish/cmds.c:9146 fish/cmds.c:9218
+#: fish/cmds.c:9258 fish/cmds.c:9316 fish/cmds.c:9342 fish/cmds.c:9368
+#: fish/cmds.c:9396 fish/cmds.c:9455 fish/cmds.c:9476 fish/cmds.c:9521
+#: fish/cmds.c:9541 fish/cmds.c:9580 fish/cmds.c:9617 fish/cmds.c:9637
+#: fish/cmds.c:9659 fish/cmds.c:9716 fish/cmds.c:9736 fish/cmds.c:9758
+#: fish/cmds.c:9780 fish/cmds.c:9799 fish/cmds.c:9819 fish/cmds.c:9846
+#: fish/cmds.c:9866 fish/cmds.c:9886 fish/cmds.c:9906 fish/cmds.c:9926
+#: fish/cmds.c:9948 fish/cmds.c:9983 fish/cmds.c:10001 fish/cmds.c:10024
+#: fish/cmds.c:10046 fish/cmds.c:10061 fish/cmds.c:10078 fish/cmds.c:10115
+#: fish/cmds.c:10154 fish/cmds.c:10194 fish/cmds.c:10250 fish/cmds.c:10272
+#: fish/cmds.c:10308 fish/cmds.c:10323 fish/cmds.c:10343 fish/cmds.c:10383
+#: fish/cmds.c:10406 fish/cmds.c:10430 fish/cmds.c:10455 fish/cmds.c:10496
+#: fish/cmds.c:10521 fish/cmds.c:10559 fish/cmds.c:10590 fish/cmds.c:10621
+#: fish/cmds.c:10649 fish/cmds.c:10669 fish/cmds.c:10701 fish/cmds.c:10721
+#: fish/cmds.c:10741 fish/cmds.c:10758 fish/cmds.c:10776 fish/cmds.c:10799
+#: fish/cmds.c:10820 fish/cmds.c:10839 fish/cmds.c:10881 fish/cmds.c:10924
+#: fish/cmds.c:10968 fish/cmds.c:11007 fish/cmds.c:11026 fish/cmds.c:11046
+#: fish/cmds.c:11066 fish/cmds.c:11087 fish/cmds.c:11108 fish/cmds.c:11129
+#: fish/cmds.c:11150 fish/cmds.c:11171 fish/cmds.c:11193 fish/cmds.c:11231
+#: fish/cmds.c:11282 fish/cmds.c:11320 fish/cmds.c:11376