-#: fish/cmds.c:1472 fish/cmds.c:1484 fish/cmds.c:1497 fish/cmds.c:1511
-#: fish/cmds.c:1525 fish/cmds.c:1540 fish/cmds.c:1555 fish/cmds.c:1568
-#: fish/cmds.c:1583 fish/cmds.c:1596 fish/cmds.c:1611 fish/cmds.c:1624
-#: fish/cmds.c:1638 fish/cmds.c:1651 fish/cmds.c:1666 fish/cmds.c:1679
-#: fish/cmds.c:1693 fish/cmds.c:1707 fish/cmds.c:1721 fish/cmds.c:1735
-#: fish/cmds.c:1749 fish/cmds.c:1764 fish/cmds.c:1795 fish/cmds.c:1809
-#: fish/cmds.c:1823 fish/cmds.c:1839 fish/cmds.c:1852 fish/cmds.c:1867
-#: fish/cmds.c:1880 fish/cmds.c:1895 fish/cmds.c:1908 fish/cmds.c:1923
-#: fish/cmds.c:1936 fish/cmds.c:1952 fish/cmds.c:1968 fish/cmds.c:1984
-#: fish/cmds.c:1998 fish/cmds.c:2011 fish/cmds.c:2027 fish/cmds.c:2046
-#: fish/cmds.c:2065 fish/cmds.c:2083 fish/cmds.c:2098 fish/cmds.c:2113
-#: fish/cmds.c:2128 fish/cmds.c:2143 fish/cmds.c:2158 fish/cmds.c:2173
-#: fish/cmds.c:2188 fish/cmds.c:2204 fish/cmds.c:2224 fish/cmds.c:2258
-#: fish/cmds.c:2272 fish/cmds.c:2291 fish/cmds.c:2310 fish/cmds.c:2328
-#: fish/cmds.c:2345 fish/cmds.c:2361 fish/cmds.c:2378 fish/cmds.c:2393
-#: fish/cmds.c:2409 fish/cmds.c:2421 fish/cmds.c:2434 fish/cmds.c:2451
-#: fish/cmds.c:2467 fish/cmds.c:2483 fish/cmds.c:2499 fish/cmds.c:2515
-#: fish/cmds.c:2532 fish/cmds.c:2569 fish/cmds.c:2623 fish/cmds.c:2641
-#: fish/cmds.c:2659 fish/cmds.c:2677 fish/cmds.c:2692 fish/cmds.c:2711
-#: fish/cmds.c:2746 fish/cmds.c:2765 fish/cmds.c:2841 fish/cmds.c:2877
-#: fish/cmds.c:2890 fish/cmds.c:2905 fish/cmds.c:2917 fish/cmds.c:2930
-#: fish/cmds.c:2949 fish/cmds.c:2968 fish/cmds.c:2987 fish/cmds.c:3006
-#: fish/cmds.c:3025 fish/cmds.c:3044 fish/cmds.c:3061 fish/cmds.c:3075
-#: fish/cmds.c:3089 fish/cmds.c:3105 fish/cmds.c:3121 fish/cmds.c:3138
-#: fish/cmds.c:3171 fish/cmds.c:3187 fish/cmds.c:3203 fish/cmds.c:3217
-#: fish/cmds.c:3232 fish/cmds.c:3252 fish/cmds.c:3272 fish/cmds.c:3293
-#: fish/cmds.c:3313 fish/cmds.c:3331 fish/cmds.c:3351 fish/cmds.c:3371
-#: fish/cmds.c:3388 fish/cmds.c:3407 fish/cmds.c:3425 fish/cmds.c:3445
-#: fish/cmds.c:3459 fish/cmds.c:3473 fish/cmds.c:3488 fish/cmds.c:3503
-#: fish/cmds.c:3521 fish/cmds.c:3536 fish/cmds.c:3554 fish/cmds.c:3571
-#: fish/cmds.c:3586 fish/cmds.c:3604 fish/cmds.c:3624 fish/cmds.c:3644
-#: fish/cmds.c:3663 fish/cmds.c:3694 fish/cmds.c:3709 fish/cmds.c:3723
-#: fish/cmds.c:3744 fish/cmds.c:3764 fish/cmds.c:3784 fish/cmds.c:3803
-#: fish/cmds.c:3817 fish/cmds.c:3836 fish/cmds.c:3927 fish/cmds.c:3944
-#: fish/cmds.c:3961 fish/cmds.c:3978 fish/cmds.c:3993 fish/cmds.c:4011
-#: fish/cmds.c:4044 fish/cmds.c:4058 fish/cmds.c:4077 fish/cmds.c:4091
-#: fish/cmds.c:4124 fish/cmds.c:4141 fish/cmds.c:4158 fish/cmds.c:4175
-#: fish/cmds.c:4194 fish/cmds.c:4208 fish/cmds.c:4224 fish/cmds.c:4240
-#: fish/cmds.c:4259 fish/cmds.c:4277 fish/cmds.c:4295 fish/cmds.c:4313
-#: fish/cmds.c:4333 fish/cmds.c:4371 fish/cmds.c:4391 fish/cmds.c:4428
-#: fish/cmds.c:4443 fish/cmds.c:4459 fish/cmds.c:4477 fish/cmds.c:4497
-#: fish/cmds.c:4516 fish/cmds.c:4531 fish/cmds.c:4547 fish/cmds.c:4565
-#: fish/cmds.c:4639 fish/cmds.c:4677 fish/cmds.c:4753 fish/cmds.c:4826
-#: fish/cmds.c:4860 fish/cmds.c:4880 fish/cmds.c:4898 fish/cmds.c:4918
-#: fish/cmds.c:4937 fish/cmds.c:4959 fish/cmds.c:4999 fish/cmds.c:5037
-#: fish/cmds.c:5055 fish/cmds.c:5071 fish/cmds.c:5087 fish/cmds.c:5101
-#: fish/cmds.c:5116 fish/cmds.c:5140 fish/cmds.c:5161 fish/cmds.c:5182
-#: fish/cmds.c:5203 fish/cmds.c:5224 fish/cmds.c:5245 fish/cmds.c:5266
-#: fish/cmds.c:5287 fish/cmds.c:5308 fish/cmds.c:5329 fish/cmds.c:5350
-#: fish/cmds.c:5371 fish/cmds.c:5391 fish/cmds.c:5411 fish/cmds.c:5429
-#: fish/cmds.c:5447 fish/cmds.c:5465 fish/cmds.c:5482 fish/cmds.c:5502
-#: fish/cmds.c:5537 fish/cmds.c:5551 fish/cmds.c:5565 fish/cmds.c:5581
-#: fish/cmds.c:5597 fish/cmds.c:5611 fish/cmds.c:5625 fish/cmds.c:5639
-#: fish/cmds.c:5653 fish/cmds.c:5669 fish/cmds.c:5702 fish/cmds.c:5739
-#: fish/cmds.c:5770 fish/cmds.c:5785 fish/cmds.c:5800 fish/cmds.c:5813
-#: fish/cmds.c:5826 fish/cmds.c:5844 fish/cmds.c:5879 fish/cmds.c:5914
-#: fish/cmds.c:5950 fish/cmds.c:5987 fish/cmds.c:6025 fish/cmds.c:6063
-#: fish/cmds.c:6098 fish/cmds.c:6112 fish/cmds.c:6132 fish/cmds.c:6151
-#: fish/cmds.c:6170 fish/cmds.c:6187 fish/cmds.c:6204 fish/cmds.c:6237
-#: fish/cmds.c:6306 fish/cmds.c:6343 fish/cmds.c:6398 fish/cmds.c:6421
-#: fish/cmds.c:6444 fish/cmds.c:6469 fish/cmds.c:6525 fish/cmds.c:6543
-#: fish/cmds.c:6585 fish/cmds.c:6602 fish/cmds.c:6638 fish/cmds.c:6672
-#: fish/cmds.c:6689 fish/cmds.c:6708 fish/cmds.c:6762 fish/cmds.c:6779
-#: fish/cmds.c:6798 fish/cmds.c:6817 fish/cmds.c:6833 fish/cmds.c:6850
-#: fish/cmds.c:6874 fish/cmds.c:6891 fish/cmds.c:6908 fish/cmds.c:6925
-#: fish/cmds.c:6942 fish/cmds.c:6961 fish/cmds.c:6993 fish/cmds.c:7008
-#: fish/cmds.c:7028 fish/cmds.c:7047 fish/cmds.c:7060 fish/cmds.c:7074
-#: fish/cmds.c:7108 fish/cmds.c:7144 fish/cmds.c:7181 fish/cmds.c:7234
-#: fish/cmds.c:7253 fish/cmds.c:7286 fish/cmds.c:7299 fish/cmds.c:7316
-#: fish/cmds.c:7353 fish/cmds.c:7373 fish/cmds.c:7394 fish/cmds.c:7416
-#: fish/cmds.c:7454 fish/cmds.c:7475 fish/cmds.c:7509 fish/cmds.c:7537
-#: fish/cmds.c:7565 fish/cmds.c:7591 fish/cmds.c:7608
+#: fish/cmds.c:2058 fish/cmds.c:2070 fish/cmds.c:2083 fish/cmds.c:2097
+#: fish/cmds.c:2111 fish/cmds.c:2126 fish/cmds.c:2141 fish/cmds.c:2154
+#: fish/cmds.c:2169 fish/cmds.c:2182 fish/cmds.c:2197 fish/cmds.c:2210
+#: fish/cmds.c:2224 fish/cmds.c:2237 fish/cmds.c:2252 fish/cmds.c:2265
+#: fish/cmds.c:2279 fish/cmds.c:2293 fish/cmds.c:2307 fish/cmds.c:2321
+#: fish/cmds.c:2335 fish/cmds.c:2350 fish/cmds.c:2381 fish/cmds.c:2395
+#: fish/cmds.c:2409 fish/cmds.c:2425 fish/cmds.c:2438 fish/cmds.c:2453
+#: fish/cmds.c:2466 fish/cmds.c:2481 fish/cmds.c:2494 fish/cmds.c:2509
+#: fish/cmds.c:2522 fish/cmds.c:2538 fish/cmds.c:2554 fish/cmds.c:2570
+#: fish/cmds.c:2584 fish/cmds.c:2597 fish/cmds.c:2613 fish/cmds.c:2632
+#: fish/cmds.c:2651 fish/cmds.c:2669 fish/cmds.c:2684 fish/cmds.c:2699
+#: fish/cmds.c:2714 fish/cmds.c:2729 fish/cmds.c:2744 fish/cmds.c:2759
+#: fish/cmds.c:2774 fish/cmds.c:2790 fish/cmds.c:2810 fish/cmds.c:2844
+#: fish/cmds.c:2858 fish/cmds.c:2877 fish/cmds.c:2896 fish/cmds.c:2914
+#: fish/cmds.c:2931 fish/cmds.c:2947 fish/cmds.c:2964 fish/cmds.c:2979
+#: fish/cmds.c:2995 fish/cmds.c:3007 fish/cmds.c:3020 fish/cmds.c:3037
+#: fish/cmds.c:3053 fish/cmds.c:3069 fish/cmds.c:3085 fish/cmds.c:3101
+#: fish/cmds.c:3118 fish/cmds.c:3155 fish/cmds.c:3209 fish/cmds.c:3227
+#: fish/cmds.c:3245 fish/cmds.c:3263 fish/cmds.c:3278 fish/cmds.c:3297
+#: fish/cmds.c:3332 fish/cmds.c:3351 fish/cmds.c:3427 fish/cmds.c:3463
+#: fish/cmds.c:3476 fish/cmds.c:3491 fish/cmds.c:3503 fish/cmds.c:3516
+#: fish/cmds.c:3535 fish/cmds.c:3554 fish/cmds.c:3573 fish/cmds.c:3592
+#: fish/cmds.c:3611 fish/cmds.c:3630 fish/cmds.c:3647 fish/cmds.c:3661
+#: fish/cmds.c:3675 fish/cmds.c:3691 fish/cmds.c:3707 fish/cmds.c:3724
+#: fish/cmds.c:3757 fish/cmds.c:3773 fish/cmds.c:3789 fish/cmds.c:3803
+#: fish/cmds.c:3818 fish/cmds.c:3838 fish/cmds.c:3858 fish/cmds.c:3879
+#: fish/cmds.c:3899 fish/cmds.c:3917 fish/cmds.c:3937 fish/cmds.c:3957
+#: fish/cmds.c:3974 fish/cmds.c:3993 fish/cmds.c:4011 fish/cmds.c:4031
+#: fish/cmds.c:4045 fish/cmds.c:4059 fish/cmds.c:4074 fish/cmds.c:4089
+#: fish/cmds.c:4107 fish/cmds.c:4122 fish/cmds.c:4140 fish/cmds.c:4157
+#: fish/cmds.c:4172 fish/cmds.c:4190 fish/cmds.c:4210 fish/cmds.c:4230
+#: fish/cmds.c:4249 fish/cmds.c:4280 fish/cmds.c:4295 fish/cmds.c:4309
+#: fish/cmds.c:4330 fish/cmds.c:4350 fish/cmds.c:4370 fish/cmds.c:4389
+#: fish/cmds.c:4403 fish/cmds.c:4422 fish/cmds.c:4513 fish/cmds.c:4530
+#: fish/cmds.c:4547 fish/cmds.c:4564 fish/cmds.c:4579 fish/cmds.c:4597
+#: fish/cmds.c:4630 fish/cmds.c:4644 fish/cmds.c:4663 fish/cmds.c:4677
+#: fish/cmds.c:4710 fish/cmds.c:4727 fish/cmds.c:4744 fish/cmds.c:4761
+#: fish/cmds.c:4780 fish/cmds.c:4794 fish/cmds.c:4810 fish/cmds.c:4826
+#: fish/cmds.c:4845 fish/cmds.c:4863 fish/cmds.c:4881 fish/cmds.c:4899
+#: fish/cmds.c:4919 fish/cmds.c:4957 fish/cmds.c:4977 fish/cmds.c:5014
+#: fish/cmds.c:5029 fish/cmds.c:5045 fish/cmds.c:5063 fish/cmds.c:5083
+#: fish/cmds.c:5102 fish/cmds.c:5117 fish/cmds.c:5133 fish/cmds.c:5151
+#: fish/cmds.c:5225 fish/cmds.c:5263 fish/cmds.c:5339 fish/cmds.c:5412
+#: fish/cmds.c:5446 fish/cmds.c:5466 fish/cmds.c:5484 fish/cmds.c:5504
+#: fish/cmds.c:5523 fish/cmds.c:5545 fish/cmds.c:5585 fish/cmds.c:5623
+#: fish/cmds.c:5641 fish/cmds.c:5657 fish/cmds.c:5673 fish/cmds.c:5687
+#: fish/cmds.c:5702 fish/cmds.c:5726 fish/cmds.c:5747 fish/cmds.c:5768
+#: fish/cmds.c:5789 fish/cmds.c:5810 fish/cmds.c:5831 fish/cmds.c:5852
+#: fish/cmds.c:5873 fish/cmds.c:5894 fish/cmds.c:5915 fish/cmds.c:5936
+#: fish/cmds.c:5957 fish/cmds.c:5977 fish/cmds.c:5997 fish/cmds.c:6015
+#: fish/cmds.c:6033 fish/cmds.c:6051 fish/cmds.c:6068 fish/cmds.c:6088
+#: fish/cmds.c:6123 fish/cmds.c:6137 fish/cmds.c:6151 fish/cmds.c:6167
+#: fish/cmds.c:6183 fish/cmds.c:6197 fish/cmds.c:6211 fish/cmds.c:6225
+#: fish/cmds.c:6239 fish/cmds.c:6255 fish/cmds.c:6288 fish/cmds.c:6325
+#: fish/cmds.c:6356 fish/cmds.c:6371 fish/cmds.c:6386 fish/cmds.c:6399
+#: fish/cmds.c:6412 fish/cmds.c:6430 fish/cmds.c:6465 fish/cmds.c:6500
+#: fish/cmds.c:6536 fish/cmds.c:6573 fish/cmds.c:6611 fish/cmds.c:6649
+#: fish/cmds.c:6684 fish/cmds.c:6698 fish/cmds.c:6718 fish/cmds.c:6737
+#: fish/cmds.c:6756 fish/cmds.c:6773 fish/cmds.c:6790 fish/cmds.c:6823
+#: fish/cmds.c:6892 fish/cmds.c:6929 fish/cmds.c:6984 fish/cmds.c:7007
+#: fish/cmds.c:7030 fish/cmds.c:7055 fish/cmds.c:7111 fish/cmds.c:7129
+#: fish/cmds.c:7171 fish/cmds.c:7188 fish/cmds.c:7224 fish/cmds.c:7258
+#: fish/cmds.c:7275 fish/cmds.c:7294 fish/cmds.c:7348 fish/cmds.c:7365
+#: fish/cmds.c:7384 fish/cmds.c:7403 fish/cmds.c:7419 fish/cmds.c:7436
+#: fish/cmds.c:7460 fish/cmds.c:7477 fish/cmds.c:7494 fish/cmds.c:7511
+#: fish/cmds.c:7528 fish/cmds.c:7547 fish/cmds.c:7579 fish/cmds.c:7594
+#: fish/cmds.c:7614 fish/cmds.c:7633 fish/cmds.c:7646 fish/cmds.c:7660
+#: fish/cmds.c:7694 fish/cmds.c:7730 fish/cmds.c:7767 fish/cmds.c:7820
+#: fish/cmds.c:7839 fish/cmds.c:7872 fish/cmds.c:7885 fish/cmds.c:7902
+#: fish/cmds.c:7939 fish/cmds.c:7959 fish/cmds.c:7980 fish/cmds.c:8002
+#: fish/cmds.c:8040 fish/cmds.c:8061 fish/cmds.c:8095 fish/cmds.c:8123
+#: fish/cmds.c:8151 fish/cmds.c:8177 fish/cmds.c:8194 fish/cmds.c:8223
+#: fish/cmds.c:8240