-#: fish/cmds.c:1468 fish/cmds.c:1480 fish/cmds.c:1493 fish/cmds.c:1507
-#: fish/cmds.c:1521 fish/cmds.c:1536 fish/cmds.c:1551 fish/cmds.c:1564
-#: fish/cmds.c:1579 fish/cmds.c:1592 fish/cmds.c:1607 fish/cmds.c:1620
-#: fish/cmds.c:1634 fish/cmds.c:1647 fish/cmds.c:1662 fish/cmds.c:1675
-#: fish/cmds.c:1689 fish/cmds.c:1703 fish/cmds.c:1717 fish/cmds.c:1731
-#: fish/cmds.c:1745 fish/cmds.c:1760 fish/cmds.c:1791 fish/cmds.c:1805
-#: fish/cmds.c:1819 fish/cmds.c:1835 fish/cmds.c:1848 fish/cmds.c:1863
-#: fish/cmds.c:1876 fish/cmds.c:1891 fish/cmds.c:1904 fish/cmds.c:1919
-#: fish/cmds.c:1932 fish/cmds.c:1948 fish/cmds.c:1964 fish/cmds.c:1980
-#: fish/cmds.c:1994 fish/cmds.c:2007 fish/cmds.c:2023 fish/cmds.c:2042
-#: fish/cmds.c:2061 fish/cmds.c:2079 fish/cmds.c:2094 fish/cmds.c:2109
-#: fish/cmds.c:2124 fish/cmds.c:2139 fish/cmds.c:2154 fish/cmds.c:2169
-#: fish/cmds.c:2184 fish/cmds.c:2200 fish/cmds.c:2220 fish/cmds.c:2254
-#: fish/cmds.c:2268 fish/cmds.c:2287 fish/cmds.c:2306 fish/cmds.c:2324
-#: fish/cmds.c:2341 fish/cmds.c:2357 fish/cmds.c:2374 fish/cmds.c:2389
-#: fish/cmds.c:2405 fish/cmds.c:2417 fish/cmds.c:2430 fish/cmds.c:2447
-#: fish/cmds.c:2463 fish/cmds.c:2479 fish/cmds.c:2495 fish/cmds.c:2511
-#: fish/cmds.c:2528 fish/cmds.c:2565 fish/cmds.c:2619 fish/cmds.c:2637
-#: fish/cmds.c:2655 fish/cmds.c:2673 fish/cmds.c:2688 fish/cmds.c:2707
-#: fish/cmds.c:2742 fish/cmds.c:2761 fish/cmds.c:2837 fish/cmds.c:2873
-#: fish/cmds.c:2886 fish/cmds.c:2901 fish/cmds.c:2913 fish/cmds.c:2926
-#: fish/cmds.c:2945 fish/cmds.c:2964 fish/cmds.c:2983 fish/cmds.c:3002
-#: fish/cmds.c:3021 fish/cmds.c:3040 fish/cmds.c:3057 fish/cmds.c:3071
-#: fish/cmds.c:3085 fish/cmds.c:3101 fish/cmds.c:3117 fish/cmds.c:3134
-#: fish/cmds.c:3167 fish/cmds.c:3183 fish/cmds.c:3199 fish/cmds.c:3213
-#: fish/cmds.c:3228 fish/cmds.c:3248 fish/cmds.c:3268 fish/cmds.c:3289
-#: fish/cmds.c:3309 fish/cmds.c:3327 fish/cmds.c:3347 fish/cmds.c:3367
-#: fish/cmds.c:3384 fish/cmds.c:3403 fish/cmds.c:3421 fish/cmds.c:3441
-#: fish/cmds.c:3455 fish/cmds.c:3469 fish/cmds.c:3484 fish/cmds.c:3499
-#: fish/cmds.c:3517 fish/cmds.c:3532 fish/cmds.c:3550 fish/cmds.c:3567
-#: fish/cmds.c:3582 fish/cmds.c:3600 fish/cmds.c:3620 fish/cmds.c:3640
-#: fish/cmds.c:3659 fish/cmds.c:3690 fish/cmds.c:3705 fish/cmds.c:3719
-#: fish/cmds.c:3740 fish/cmds.c:3760 fish/cmds.c:3780 fish/cmds.c:3799
-#: fish/cmds.c:3813 fish/cmds.c:3832 fish/cmds.c:3923 fish/cmds.c:3940
-#: fish/cmds.c:3957 fish/cmds.c:3974 fish/cmds.c:3989 fish/cmds.c:4007
-#: fish/cmds.c:4040 fish/cmds.c:4054 fish/cmds.c:4073 fish/cmds.c:4087
-#: fish/cmds.c:4120 fish/cmds.c:4137 fish/cmds.c:4154 fish/cmds.c:4171
-#: fish/cmds.c:4190 fish/cmds.c:4204 fish/cmds.c:4220 fish/cmds.c:4236
-#: fish/cmds.c:4255 fish/cmds.c:4273 fish/cmds.c:4291 fish/cmds.c:4309
-#: fish/cmds.c:4329 fish/cmds.c:4367 fish/cmds.c:4387 fish/cmds.c:4424
-#: fish/cmds.c:4439 fish/cmds.c:4455 fish/cmds.c:4473 fish/cmds.c:4493
-#: fish/cmds.c:4512 fish/cmds.c:4527 fish/cmds.c:4543 fish/cmds.c:4561
-#: fish/cmds.c:4635 fish/cmds.c:4673 fish/cmds.c:4749 fish/cmds.c:4822
-#: fish/cmds.c:4856 fish/cmds.c:4876 fish/cmds.c:4894 fish/cmds.c:4914
-#: fish/cmds.c:4933 fish/cmds.c:4955 fish/cmds.c:4995 fish/cmds.c:5033
-#: fish/cmds.c:5051 fish/cmds.c:5067 fish/cmds.c:5083 fish/cmds.c:5097
-#: fish/cmds.c:5112 fish/cmds.c:5136 fish/cmds.c:5157 fish/cmds.c:5178
-#: fish/cmds.c:5199 fish/cmds.c:5220 fish/cmds.c:5241 fish/cmds.c:5262
-#: fish/cmds.c:5283 fish/cmds.c:5304 fish/cmds.c:5325 fish/cmds.c:5346
-#: fish/cmds.c:5367 fish/cmds.c:5387 fish/cmds.c:5407 fish/cmds.c:5425
-#: fish/cmds.c:5443 fish/cmds.c:5461 fish/cmds.c:5478 fish/cmds.c:5498
-#: fish/cmds.c:5533 fish/cmds.c:5547 fish/cmds.c:5561 fish/cmds.c:5577
-#: fish/cmds.c:5593 fish/cmds.c:5607 fish/cmds.c:5621 fish/cmds.c:5635
-#: fish/cmds.c:5649 fish/cmds.c:5665 fish/cmds.c:5698 fish/cmds.c:5735
-#: fish/cmds.c:5766 fish/cmds.c:5781 fish/cmds.c:5796 fish/cmds.c:5809
-#: fish/cmds.c:5822 fish/cmds.c:5840 fish/cmds.c:5875 fish/cmds.c:5910
-#: fish/cmds.c:5946 fish/cmds.c:5983 fish/cmds.c:6021 fish/cmds.c:6059
-#: fish/cmds.c:6094 fish/cmds.c:6108 fish/cmds.c:6128 fish/cmds.c:6147
-#: fish/cmds.c:6166 fish/cmds.c:6183 fish/cmds.c:6200 fish/cmds.c:6233
-#: fish/cmds.c:6302 fish/cmds.c:6339 fish/cmds.c:6394 fish/cmds.c:6417
-#: fish/cmds.c:6440 fish/cmds.c:6465 fish/cmds.c:6521 fish/cmds.c:6539
-#: fish/cmds.c:6581 fish/cmds.c:6598 fish/cmds.c:6634 fish/cmds.c:6668
-#: fish/cmds.c:6685 fish/cmds.c:6704 fish/cmds.c:6758 fish/cmds.c:6775
-#: fish/cmds.c:6794 fish/cmds.c:6813 fish/cmds.c:6829 fish/cmds.c:6846
-#: fish/cmds.c:6870 fish/cmds.c:6887 fish/cmds.c:6904 fish/cmds.c:6921
-#: fish/cmds.c:6938 fish/cmds.c:6957 fish/cmds.c:6989 fish/cmds.c:7004
-#: fish/cmds.c:7024 fish/cmds.c:7043 fish/cmds.c:7056 fish/cmds.c:7070
-#: fish/cmds.c:7104 fish/cmds.c:7140 fish/cmds.c:7177 fish/cmds.c:7230
-#: fish/cmds.c:7249 fish/cmds.c:7282 fish/cmds.c:7295 fish/cmds.c:7312
-#: fish/cmds.c:7349 fish/cmds.c:7369 fish/cmds.c:7390 fish/cmds.c:7412
-#: fish/cmds.c:7450 fish/cmds.c:7471 fish/cmds.c:7505 fish/cmds.c:7533
-#: fish/cmds.c:7561 fish/cmds.c:7587
+#: 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