-#: fish/cmds.c:2360 fish/cmds.c:2373 fish/cmds.c:2388 fish/cmds.c:2404
-#: fish/cmds.c:2420 fish/cmds.c:2437 fish/cmds.c:2455 fish/cmds.c:2470
-#: fish/cmds.c:2487 fish/cmds.c:2502 fish/cmds.c:2519 fish/cmds.c:2534
-#: fish/cmds.c:2550 fish/cmds.c:2564 fish/cmds.c:2581 fish/cmds.c:2595
-#: fish/cmds.c:2610 fish/cmds.c:2625 fish/cmds.c:2640 fish/cmds.c:2655
-#: fish/cmds.c:2670 fish/cmds.c:2687 fish/cmds.c:2719 fish/cmds.c:2734
-#: fish/cmds.c:2749 fish/cmds.c:2767 fish/cmds.c:2781 fish/cmds.c:2798
-#: fish/cmds.c:2812 fish/cmds.c:2829 fish/cmds.c:2843 fish/cmds.c:2860
-#: fish/cmds.c:2874 fish/cmds.c:2892 fish/cmds.c:2910 fish/cmds.c:2927
-#: fish/cmds.c:2946 fish/cmds.c:2964 fish/cmds.c:2983 fish/cmds.c:3002
-#: fish/cmds.c:3021 fish/cmds.c:3039 fish/cmds.c:3057 fish/cmds.c:3076
-#: fish/cmds.c:3095 fish/cmds.c:3114 fish/cmds.c:3128 fish/cmds.c:3143
-#: fish/cmds.c:3163 fish/cmds.c:3207 fish/cmds.c:3222 fish/cmds.c:3237
-#: fish/cmds.c:3255 fish/cmds.c:3276 fish/cmds.c:3297 fish/cmds.c:3316
-#: fish/cmds.c:3332 fish/cmds.c:3348 fish/cmds.c:3364 fish/cmds.c:3380
-#: fish/cmds.c:3396 fish/cmds.c:3412 fish/cmds.c:3428 fish/cmds.c:3446
-#: fish/cmds.c:3468 fish/cmds.c:3503 fish/cmds.c:3519 fish/cmds.c:3541
-#: fish/cmds.c:3562 fish/cmds.c:3582 fish/cmds.c:3601 fish/cmds.c:3619
-#: fish/cmds.c:3638 fish/cmds.c:3655 fish/cmds.c:3672 fish/cmds.c:3685
-#: fish/cmds.c:3700 fish/cmds.c:3719 fish/cmds.c:3737 fish/cmds.c:3755
-#: fish/cmds.c:3773 fish/cmds.c:3791 fish/cmds.c:3810 fish/cmds.c:3849
-#: fish/cmds.c:3905 fish/cmds.c:3925 fish/cmds.c:3945 fish/cmds.c:3965
-#: fish/cmds.c:3982 fish/cmds.c:4003 fish/cmds.c:4040 fish/cmds.c:4061
-#: fish/cmds.c:4139 fish/cmds.c:4177 fish/cmds.c:4191 fish/cmds.c:4207
-#: fish/cmds.c:4220 fish/cmds.c:4235 fish/cmds.c:4256 fish/cmds.c:4277
-#: fish/cmds.c:4298 fish/cmds.c:4319 fish/cmds.c:4340 fish/cmds.c:4361
-#: fish/cmds.c:4380 fish/cmds.c:4396 fish/cmds.c:4412 fish/cmds.c:4430
-#: fish/cmds.c:4448 fish/cmds.c:4467 fish/cmds.c:4502 fish/cmds.c:4520
-#: fish/cmds.c:4538 fish/cmds.c:4554 fish/cmds.c:4571 fish/cmds.c:4593
-#: fish/cmds.c:4615 fish/cmds.c:4638 fish/cmds.c:4660 fish/cmds.c:4680
-#: fish/cmds.c:4702 fish/cmds.c:4724 fish/cmds.c:4743 fish/cmds.c:4764
-#: fish/cmds.c:4784 fish/cmds.c:4806 fish/cmds.c:4822 fish/cmds.c:4838
-#: fish/cmds.c:4855 fish/cmds.c:4872 fish/cmds.c:4892 fish/cmds.c:4909
-#: fish/cmds.c:4929 fish/cmds.c:4948 fish/cmds.c:4965 fish/cmds.c:4985
-#: fish/cmds.c:5007 fish/cmds.c:5029 fish/cmds.c:5050 fish/cmds.c:5082
-#: fish/cmds.c:5098 fish/cmds.c:5114 fish/cmds.c:5137 fish/cmds.c:5159
-#: fish/cmds.c:5181 fish/cmds.c:5202 fish/cmds.c:5218 fish/cmds.c:5239
-#: fish/cmds.c:5332 fish/cmds.c:5351 fish/cmds.c:5370 fish/cmds.c:5389
-#: fish/cmds.c:5406 fish/cmds.c:5426 fish/cmds.c:5461 fish/cmds.c:5477
-#: fish/cmds.c:5498 fish/cmds.c:5514 fish/cmds.c:5549 fish/cmds.c:5568
-#: fish/cmds.c:5587 fish/cmds.c:5606 fish/cmds.c:5627 fish/cmds.c:5643
-#: fish/cmds.c:5661 fish/cmds.c:5679 fish/cmds.c:5700 fish/cmds.c:5720
-#: fish/cmds.c:5740 fish/cmds.c:5760 fish/cmds.c:5782 fish/cmds.c:5822
-#: fish/cmds.c:5844 fish/cmds.c:5882 fish/cmds.c:5898 fish/cmds.c:5916
-#: fish/cmds.c:5936 fish/cmds.c:5958 fish/cmds.c:5979 fish/cmds.c:5996
-#: fish/cmds.c:6014 fish/cmds.c:6034 fish/cmds.c:6110 fish/cmds.c:6150
-#: fish/cmds.c:6228 fish/cmds.c:6303 fish/cmds.c:6339 fish/cmds.c:6361
-#: fish/cmds.c:6381 fish/cmds.c:6403 fish/cmds.c:6424 fish/cmds.c:6448
-#: fish/cmds.c:6490 fish/cmds.c:6530 fish/cmds.c:6550 fish/cmds.c:6567
-#: fish/cmds.c:6585 fish/cmds.c:6601 fish/cmds.c:6618 fish/cmds.c:6644
-#: fish/cmds.c:6667 fish/cmds.c:6690 fish/cmds.c:6713 fish/cmds.c:6736
-#: fish/cmds.c:6759 fish/cmds.c:6782 fish/cmds.c:6805 fish/cmds.c:6828
-#: fish/cmds.c:6851 fish/cmds.c:6874 fish/cmds.c:6897 fish/cmds.c:6919
-#: fish/cmds.c:6941 fish/cmds.c:6961 fish/cmds.c:6981 fish/cmds.c:7001
-#: fish/cmds.c:7020 fish/cmds.c:7042 fish/cmds.c:7079 fish/cmds.c:7095
-#: fish/cmds.c:7111 fish/cmds.c:7129 fish/cmds.c:7147 fish/cmds.c:7163
-#: fish/cmds.c:7179 fish/cmds.c:7195 fish/cmds.c:7211 fish/cmds.c:7229
-#: fish/cmds.c:7264 fish/cmds.c:7303 fish/cmds.c:7335 fish/cmds.c:7351
-#: fish/cmds.c:7367 fish/cmds.c:7382 fish/cmds.c:7396 fish/cmds.c:7416
-#: fish/cmds.c:7453 fish/cmds.c:7490 fish/cmds.c:7528 fish/cmds.c:7567
-#: fish/cmds.c:7607 fish/cmds.c:7647 fish/cmds.c:7684 fish/cmds.c:7700
-#: fish/cmds.c:7722 fish/cmds.c:7743 fish/cmds.c:7764 fish/cmds.c:7783
-#: fish/cmds.c:7802 fish/cmds.c:7837 fish/cmds.c:7908 fish/cmds.c:7947
-#: fish/cmds.c:8004 fish/cmds.c:8029 fish/cmds.c:8054 fish/cmds.c:8081
-#: fish/cmds.c:8139 fish/cmds.c:8159 fish/cmds.c:8203 fish/cmds.c:8222
-#: fish/cmds.c:8260 fish/cmds.c:8296 fish/cmds.c:8315 fish/cmds.c:8336
-#: fish/cmds.c:8392 fish/cmds.c:8411 fish/cmds.c:8432 fish/cmds.c:8453
-#: fish/cmds.c:8471 fish/cmds.c:8490 fish/cmds.c:8516 fish/cmds.c:8535
-#: fish/cmds.c:8554 fish/cmds.c:8573 fish/cmds.c:8592 fish/cmds.c:8613
-#: fish/cmds.c:8647 fish/cmds.c:8664 fish/cmds.c:8686 fish/cmds.c:8707
-#: fish/cmds.c:8721 fish/cmds.c:8737 fish/cmds.c:8773 fish/cmds.c:8811
-#: fish/cmds.c:8850 fish/cmds.c:8905 fish/cmds.c:8926 fish/cmds.c:8961
-#: fish/cmds.c:8975 fish/cmds.c:8994 fish/cmds.c:9033 fish/cmds.c:9055
-#: fish/cmds.c:9078 fish/cmds.c:9102 fish/cmds.c:9142 fish/cmds.c:9166
-#: fish/cmds.c:9203 fish/cmds.c:9233 fish/cmds.c:9263 fish/cmds.c:9290
-#: fish/cmds.c:9309 fish/cmds.c:9340 fish/cmds.c:9359 fish/cmds.c:9378
-#: fish/cmds.c:9394 fish/cmds.c:9411 fish/cmds.c:9433 fish/cmds.c:9453
-#: fish/cmds.c:9471 fish/cmds.c:9512 fish/cmds.c:9554 fish/cmds.c:9597
-#: fish/cmds.c:9635 fish/cmds.c:9653 fish/cmds.c:9672 fish/cmds.c:9691
-#: fish/cmds.c:9711 fish/cmds.c:9731 fish/cmds.c:9751 fish/cmds.c:9771
-#: fish/cmds.c:9791 fish/cmds.c:9812 fish/cmds.c:9849 fish/cmds.c:9899
-#: fish/cmds.c:9936
+#: 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