-#: fish/cmds.c:2353 fish/cmds.c:2365 fish/cmds.c:2378 fish/cmds.c:2393
-#: fish/cmds.c:2408 fish/cmds.c:2424 fish/cmds.c:2441 fish/cmds.c:2456
-#: fish/cmds.c:2471 fish/cmds.c:2486 fish/cmds.c:2501 fish/cmds.c:2516
-#: fish/cmds.c:2530 fish/cmds.c:2544 fish/cmds.c:2559 fish/cmds.c:2573
-#: fish/cmds.c:2587 fish/cmds.c:2601 fish/cmds.c:2615 fish/cmds.c:2629
-#: fish/cmds.c:2643 fish/cmds.c:2658 fish/cmds.c:2690 fish/cmds.c:2704
-#: fish/cmds.c:2718 fish/cmds.c:2734 fish/cmds.c:2748 fish/cmds.c:2763
-#: fish/cmds.c:2777 fish/cmds.c:2792 fish/cmds.c:2806 fish/cmds.c:2821
-#: fish/cmds.c:2835 fish/cmds.c:2851 fish/cmds.c:2868 fish/cmds.c:2884
-#: fish/cmds.c:2903 fish/cmds.c:2919 fish/cmds.c:2937 fish/cmds.c:2955
-#: fish/cmds.c:2973 fish/cmds.c:2990 fish/cmds.c:3007 fish/cmds.c:3025
-#: fish/cmds.c:3043 fish/cmds.c:3061 fish/cmds.c:3075 fish/cmds.c:3089
-#: fish/cmds.c:3106 fish/cmds.c:3121 fish/cmds.c:3134 fish/cmds.c:3151
-#: fish/cmds.c:3171 fish/cmds.c:3191 fish/cmds.c:3210 fish/cmds.c:3225
-#: fish/cmds.c:3240 fish/cmds.c:3255 fish/cmds.c:3270 fish/cmds.c:3285
-#: fish/cmds.c:3300 fish/cmds.c:3315 fish/cmds.c:3331 fish/cmds.c:3352
-#: fish/cmds.c:3387 fish/cmds.c:3401 fish/cmds.c:3422 fish/cmds.c:3442
-#: fish/cmds.c:3461 fish/cmds.c:3479 fish/cmds.c:3496 fish/cmds.c:3514
-#: fish/cmds.c:3530 fish/cmds.c:3547 fish/cmds.c:3559 fish/cmds.c:3572
-#: fish/cmds.c:3590 fish/cmds.c:3607 fish/cmds.c:3624 fish/cmds.c:3641
-#: fish/cmds.c:3658 fish/cmds.c:3676 fish/cmds.c:3714 fish/cmds.c:3769
-#: fish/cmds.c:3788 fish/cmds.c:3807 fish/cmds.c:3826 fish/cmds.c:3842
-#: fish/cmds.c:3862 fish/cmds.c:3898 fish/cmds.c:3918 fish/cmds.c:3995
-#: fish/cmds.c:4032 fish/cmds.c:4046 fish/cmds.c:4061 fish/cmds.c:4073
-#: fish/cmds.c:4086 fish/cmds.c:4106 fish/cmds.c:4126 fish/cmds.c:4146
-#: fish/cmds.c:4166 fish/cmds.c:4186 fish/cmds.c:4206 fish/cmds.c:4224
-#: fish/cmds.c:4239 fish/cmds.c:4254 fish/cmds.c:4271 fish/cmds.c:4288
-#: fish/cmds.c:4306 fish/cmds.c:4340 fish/cmds.c:4357 fish/cmds.c:4374
-#: fish/cmds.c:4389 fish/cmds.c:4405 fish/cmds.c:4426 fish/cmds.c:4447
-#: fish/cmds.c:4469 fish/cmds.c:4490 fish/cmds.c:4509 fish/cmds.c:4530
-#: fish/cmds.c:4551 fish/cmds.c:4569 fish/cmds.c:4589 fish/cmds.c:4608
-#: fish/cmds.c:4629 fish/cmds.c:4644 fish/cmds.c:4659 fish/cmds.c:4675
-#: fish/cmds.c:4691 fish/cmds.c:4710 fish/cmds.c:4726 fish/cmds.c:4745
-#: fish/cmds.c:4763 fish/cmds.c:4779 fish/cmds.c:4798 fish/cmds.c:4819
-#: fish/cmds.c:4840 fish/cmds.c:4860 fish/cmds.c:4892 fish/cmds.c:4907
-#: fish/cmds.c:4921 fish/cmds.c:4943 fish/cmds.c:4964 fish/cmds.c:4985
-#: fish/cmds.c:5005 fish/cmds.c:5020 fish/cmds.c:5040 fish/cmds.c:5132
-#: fish/cmds.c:5150 fish/cmds.c:5168 fish/cmds.c:5186 fish/cmds.c:5202
-#: fish/cmds.c:5221 fish/cmds.c:5255 fish/cmds.c:5270 fish/cmds.c:5290
-#: fish/cmds.c:5305 fish/cmds.c:5339 fish/cmds.c:5357 fish/cmds.c:5375
-#: fish/cmds.c:5393 fish/cmds.c:5413 fish/cmds.c:5428 fish/cmds.c:5445
-#: fish/cmds.c:5462 fish/cmds.c:5482 fish/cmds.c:5501 fish/cmds.c:5520
-#: fish/cmds.c:5539 fish/cmds.c:5560 fish/cmds.c:5599 fish/cmds.c:5620
-#: fish/cmds.c:5658 fish/cmds.c:5673 fish/cmds.c:5689 fish/cmds.c:5708
-#: fish/cmds.c:5729 fish/cmds.c:5749 fish/cmds.c:5765 fish/cmds.c:5782
-#: fish/cmds.c:5801 fish/cmds.c:5876 fish/cmds.c:5915 fish/cmds.c:5992
-#: fish/cmds.c:6066 fish/cmds.c:6101 fish/cmds.c:6122 fish/cmds.c:6141
-#: fish/cmds.c:6162 fish/cmds.c:6182 fish/cmds.c:6205 fish/cmds.c:6246
-#: fish/cmds.c:6285 fish/cmds.c:6304 fish/cmds.c:6321 fish/cmds.c:6337
-#: fish/cmds.c:6352 fish/cmds.c:6368 fish/cmds.c:6393 fish/cmds.c:6415
-#: fish/cmds.c:6437 fish/cmds.c:6459 fish/cmds.c:6481 fish/cmds.c:6503
-#: fish/cmds.c:6525 fish/cmds.c:6547 fish/cmds.c:6569 fish/cmds.c:6591
-#: fish/cmds.c:6613 fish/cmds.c:6635 fish/cmds.c:6656 fish/cmds.c:6677
-#: fish/cmds.c:6696 fish/cmds.c:6715 fish/cmds.c:6734 fish/cmds.c:6752
-#: fish/cmds.c:6773 fish/cmds.c:6809 fish/cmds.c:6824 fish/cmds.c:6839
-#: fish/cmds.c:6856 fish/cmds.c:6873 fish/cmds.c:6888 fish/cmds.c:6903
-#: fish/cmds.c:6918 fish/cmds.c:6933 fish/cmds.c:6950 fish/cmds.c:6984
-#: fish/cmds.c:7022 fish/cmds.c:7054 fish/cmds.c:7069 fish/cmds.c:7084
-#: fish/cmds.c:7097 fish/cmds.c:7111 fish/cmds.c:7129 fish/cmds.c:7165
-#: fish/cmds.c:7201 fish/cmds.c:7238 fish/cmds.c:7276 fish/cmds.c:7315
-#: fish/cmds.c:7354 fish/cmds.c:7390 fish/cmds.c:7405 fish/cmds.c:7426
-#: fish/cmds.c:7446 fish/cmds.c:7466 fish/cmds.c:7484 fish/cmds.c:7502
-#: fish/cmds.c:7536 fish/cmds.c:7606 fish/cmds.c:7644 fish/cmds.c:7700
-#: fish/cmds.c:7724 fish/cmds.c:7748 fish/cmds.c:7774 fish/cmds.c:7831
-#: fish/cmds.c:7850 fish/cmds.c:7893 fish/cmds.c:7911 fish/cmds.c:7948
-#: fish/cmds.c:7983 fish/cmds.c:8001 fish/cmds.c:8021 fish/cmds.c:8076
-#: fish/cmds.c:8094 fish/cmds.c:8114 fish/cmds.c:8134 fish/cmds.c:8151
-#: fish/cmds.c:8169 fish/cmds.c:8194 fish/cmds.c:8212 fish/cmds.c:8230
-#: fish/cmds.c:8248 fish/cmds.c:8266 fish/cmds.c:8286 fish/cmds.c:8319
-#: fish/cmds.c:8335 fish/cmds.c:8356 fish/cmds.c:8376 fish/cmds.c:8390
-#: fish/cmds.c:8404 fish/cmds.c:8439 fish/cmds.c:8476 fish/cmds.c:8514
-#: fish/cmds.c:8568 fish/cmds.c:8588 fish/cmds.c:8622 fish/cmds.c:8636
-#: fish/cmds.c:8653 fish/cmds.c:8691 fish/cmds.c:8712 fish/cmds.c:8734
-#: fish/cmds.c:8757 fish/cmds.c:8796 fish/cmds.c:8819 fish/cmds.c:8855
-#: fish/cmds.c:8884 fish/cmds.c:8913 fish/cmds.c:8940 fish/cmds.c:8957
-#: fish/cmds.c:8987 fish/cmds.c:9005 fish/cmds.c:9023 fish/cmds.c:9039
-#: fish/cmds.c:9054 fish/cmds.c:9075 fish/cmds.c:9094 fish/cmds.c:9111
-#: fish/cmds.c:9151 fish/cmds.c:9192 fish/cmds.c:9234 fish/cmds.c:9271
-#: fish/cmds.c:9288 fish/cmds.c:9306 fish/cmds.c:9324 fish/cmds.c:9343
-#: fish/cmds.c:9362 fish/cmds.c:9381 fish/cmds.c:9400 fish/cmds.c:9419
-#: fish/cmds.c:9439 fish/cmds.c:9475 fish/cmds.c:9524 fish/cmds.c:9560
+#: 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