-#: 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:2112 fish/cmds.c:2124 fish/cmds.c:2137 fish/cmds.c:2152
+#: fish/cmds.c:2167 fish/cmds.c:2183 fish/cmds.c:2200 fish/cmds.c:2215
+#: fish/cmds.c:2230 fish/cmds.c:2245 fish/cmds.c:2260 fish/cmds.c:2275
+#: fish/cmds.c:2289 fish/cmds.c:2303 fish/cmds.c:2318 fish/cmds.c:2332
+#: fish/cmds.c:2346 fish/cmds.c:2360 fish/cmds.c:2374 fish/cmds.c:2388
+#: fish/cmds.c:2402 fish/cmds.c:2417 fish/cmds.c:2449 fish/cmds.c:2463
+#: fish/cmds.c:2477 fish/cmds.c:2493 fish/cmds.c:2507 fish/cmds.c:2522
+#: fish/cmds.c:2536 fish/cmds.c:2551 fish/cmds.c:2565 fish/cmds.c:2580
+#: fish/cmds.c:2594 fish/cmds.c:2610 fish/cmds.c:2627 fish/cmds.c:2644
+#: fish/cmds.c:2659 fish/cmds.c:2672 fish/cmds.c:2689 fish/cmds.c:2709
+#: fish/cmds.c:2729 fish/cmds.c:2748 fish/cmds.c:2763 fish/cmds.c:2778
+#: fish/cmds.c:2793 fish/cmds.c:2808 fish/cmds.c:2823 fish/cmds.c:2838
+#: fish/cmds.c:2853 fish/cmds.c:2869 fish/cmds.c:2890 fish/cmds.c:2925
+#: fish/cmds.c:2939 fish/cmds.c:2960 fish/cmds.c:2980 fish/cmds.c:2999
+#: fish/cmds.c:3017 fish/cmds.c:3034 fish/cmds.c:3052 fish/cmds.c:3068
+#: fish/cmds.c:3085 fish/cmds.c:3097 fish/cmds.c:3110 fish/cmds.c:3128
+#: fish/cmds.c:3145 fish/cmds.c:3162 fish/cmds.c:3179 fish/cmds.c:3196
+#: fish/cmds.c:3214 fish/cmds.c:3252 fish/cmds.c:3307 fish/cmds.c:3326
+#: fish/cmds.c:3345 fish/cmds.c:3364 fish/cmds.c:3380 fish/cmds.c:3400
+#: fish/cmds.c:3436 fish/cmds.c:3456 fish/cmds.c:3533 fish/cmds.c:3570
+#: fish/cmds.c:3584 fish/cmds.c:3599 fish/cmds.c:3611 fish/cmds.c:3624
+#: fish/cmds.c:3644 fish/cmds.c:3664 fish/cmds.c:3684 fish/cmds.c:3704
+#: fish/cmds.c:3724 fish/cmds.c:3744 fish/cmds.c:3762 fish/cmds.c:3777
+#: fish/cmds.c:3792 fish/cmds.c:3809 fish/cmds.c:3826 fish/cmds.c:3844
+#: fish/cmds.c:3878 fish/cmds.c:3895 fish/cmds.c:3912 fish/cmds.c:3927
+#: fish/cmds.c:3943 fish/cmds.c:3964 fish/cmds.c:3985 fish/cmds.c:4007
+#: fish/cmds.c:4028 fish/cmds.c:4047 fish/cmds.c:4068 fish/cmds.c:4089
+#: fish/cmds.c:4107 fish/cmds.c:4127 fish/cmds.c:4146 fish/cmds.c:4167
+#: fish/cmds.c:4182 fish/cmds.c:4197 fish/cmds.c:4213 fish/cmds.c:4229
+#: fish/cmds.c:4248 fish/cmds.c:4264 fish/cmds.c:4283 fish/cmds.c:4301
+#: fish/cmds.c:4317 fish/cmds.c:4336 fish/cmds.c:4357 fish/cmds.c:4378
+#: fish/cmds.c:4398 fish/cmds.c:4430 fish/cmds.c:4445 fish/cmds.c:4459
+#: fish/cmds.c:4481 fish/cmds.c:4502 fish/cmds.c:4523 fish/cmds.c:4543
+#: fish/cmds.c:4558 fish/cmds.c:4578 fish/cmds.c:4670 fish/cmds.c:4688
+#: fish/cmds.c:4706 fish/cmds.c:4724 fish/cmds.c:4740 fish/cmds.c:4759
+#: fish/cmds.c:4793 fish/cmds.c:4808 fish/cmds.c:4828 fish/cmds.c:4843
+#: fish/cmds.c:4877 fish/cmds.c:4895 fish/cmds.c:4913 fish/cmds.c:4931
+#: fish/cmds.c:4951 fish/cmds.c:4966 fish/cmds.c:4983 fish/cmds.c:5000
+#: fish/cmds.c:5020 fish/cmds.c:5039 fish/cmds.c:5058 fish/cmds.c:5077
+#: fish/cmds.c:5098 fish/cmds.c:5137 fish/cmds.c:5158 fish/cmds.c:5196
+#: fish/cmds.c:5211 fish/cmds.c:5227 fish/cmds.c:5246 fish/cmds.c:5267
+#: fish/cmds.c:5287 fish/cmds.c:5303 fish/cmds.c:5320 fish/cmds.c:5339
+#: fish/cmds.c:5414 fish/cmds.c:5453 fish/cmds.c:5530 fish/cmds.c:5604
+#: fish/cmds.c:5639 fish/cmds.c:5660 fish/cmds.c:5679 fish/cmds.c:5700
+#: fish/cmds.c:5720 fish/cmds.c:5743 fish/cmds.c:5784 fish/cmds.c:5823
+#: fish/cmds.c:5842 fish/cmds.c:5859 fish/cmds.c:5875 fish/cmds.c:5890
+#: fish/cmds.c:5906 fish/cmds.c:5931 fish/cmds.c:5953 fish/cmds.c:5975
+#: fish/cmds.c:5997 fish/cmds.c:6019 fish/cmds.c:6041 fish/cmds.c:6063
+#: fish/cmds.c:6085 fish/cmds.c:6107 fish/cmds.c:6129 fish/cmds.c:6151
+#: fish/cmds.c:6173 fish/cmds.c:6194 fish/cmds.c:6215 fish/cmds.c:6234
+#: fish/cmds.c:6253 fish/cmds.c:6272 fish/cmds.c:6290 fish/cmds.c:6311
+#: fish/cmds.c:6347 fish/cmds.c:6362 fish/cmds.c:6377 fish/cmds.c:6394
+#: fish/cmds.c:6411 fish/cmds.c:6426 fish/cmds.c:6441 fish/cmds.c:6456
+#: fish/cmds.c:6471 fish/cmds.c:6488 fish/cmds.c:6522 fish/cmds.c:6560
+#: fish/cmds.c:6592 fish/cmds.c:6607 fish/cmds.c:6622 fish/cmds.c:6635
+#: fish/cmds.c:6649 fish/cmds.c:6667 fish/cmds.c:6703 fish/cmds.c:6739
+#: fish/cmds.c:6776 fish/cmds.c:6814 fish/cmds.c:6853 fish/cmds.c:6892
+#: fish/cmds.c:6928 fish/cmds.c:6943 fish/cmds.c:6964 fish/cmds.c:6984
+#: fish/cmds.c:7004 fish/cmds.c:7022 fish/cmds.c:7040 fish/cmds.c:7074
+#: fish/cmds.c:7144 fish/cmds.c:7182 fish/cmds.c:7238 fish/cmds.c:7262
+#: fish/cmds.c:7286 fish/cmds.c:7312 fish/cmds.c:7369 fish/cmds.c:7388
+#: fish/cmds.c:7431 fish/cmds.c:7449 fish/cmds.c:7486 fish/cmds.c:7521
+#: fish/cmds.c:7539 fish/cmds.c:7559 fish/cmds.c:7614 fish/cmds.c:7632
+#: fish/cmds.c:7652 fish/cmds.c:7672 fish/cmds.c:7689 fish/cmds.c:7707
+#: fish/cmds.c:7732 fish/cmds.c:7750 fish/cmds.c:7768 fish/cmds.c:7786
+#: fish/cmds.c:7804 fish/cmds.c:7824 fish/cmds.c:7857 fish/cmds.c:7873
+#: fish/cmds.c:7894 fish/cmds.c:7914 fish/cmds.c:7928 fish/cmds.c:7942
+#: fish/cmds.c:7977 fish/cmds.c:8014 fish/cmds.c:8052 fish/cmds.c:8106
+#: fish/cmds.c:8126 fish/cmds.c:8160 fish/cmds.c:8174 fish/cmds.c:8191
+#: fish/cmds.c:8229 fish/cmds.c:8250 fish/cmds.c:8272 fish/cmds.c:8295
+#: fish/cmds.c:8334 fish/cmds.c:8357 fish/cmds.c:8393 fish/cmds.c:8422
+#: fish/cmds.c:8451 fish/cmds.c:8478 fish/cmds.c:8495 fish/cmds.c:8525
+#: fish/cmds.c:8543 fish/cmds.c:8561 fish/cmds.c:8577 fish/cmds.c:8592
+#: fish/cmds.c:8613 fish/cmds.c:8632 fish/cmds.c:8649 fish/cmds.c:8689
+#: fish/cmds.c:8730 fish/cmds.c:8772