-#: 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:3392 fish/cmds.c:3406 fish/cmds.c:3422 fish/cmds.c:3439
+#: fish/cmds.c:3456 fish/cmds.c:3474 fish/cmds.c:3493 fish/cmds.c:3509
+#: fish/cmds.c:3527 fish/cmds.c:3543 fish/cmds.c:3561 fish/cmds.c:3577
+#: fish/cmds.c:3594 fish/cmds.c:3609 fish/cmds.c:3627 fish/cmds.c:3642
+#: fish/cmds.c:3658 fish/cmds.c:3674 fish/cmds.c:3690 fish/cmds.c:3706
+#: fish/cmds.c:3722 fish/cmds.c:3740 fish/cmds.c:3773 fish/cmds.c:3789
+#: fish/cmds.c:3805 fish/cmds.c:3824 fish/cmds.c:3839 fish/cmds.c:3857
+#: fish/cmds.c:3872 fish/cmds.c:3890 fish/cmds.c:3905 fish/cmds.c:3923
+#: fish/cmds.c:3938 fish/cmds.c:3957 fish/cmds.c:3976 fish/cmds.c:3994
+#: fish/cmds.c:4014 fish/cmds.c:4033 fish/cmds.c:4053 fish/cmds.c:4073
+#: fish/cmds.c:4093 fish/cmds.c:4112 fish/cmds.c:4131 fish/cmds.c:4151
+#: fish/cmds.c:4171 fish/cmds.c:4191 fish/cmds.c:4206 fish/cmds.c:4222
+#: fish/cmds.c:4243 fish/cmds.c:4294 fish/cmds.c:4315 fish/cmds.c:4331
+#: fish/cmds.c:4347 fish/cmds.c:4366 fish/cmds.c:4388 fish/cmds.c:4410
+#: fish/cmds.c:4430 fish/cmds.c:4447 fish/cmds.c:4464 fish/cmds.c:4481
+#: fish/cmds.c:4498 fish/cmds.c:4515 fish/cmds.c:4532 fish/cmds.c:4549
+#: fish/cmds.c:4568 fish/cmds.c:4591 fish/cmds.c:4627 fish/cmds.c:4644
+#: fish/cmds.c:4667 fish/cmds.c:4689 fish/cmds.c:4710 fish/cmds.c:4730
+#: fish/cmds.c:4749 fish/cmds.c:4769 fish/cmds.c:4787 fish/cmds.c:4805
+#: fish/cmds.c:4819 fish/cmds.c:4835 fish/cmds.c:4855 fish/cmds.c:4874
+#: fish/cmds.c:4893 fish/cmds.c:4912 fish/cmds.c:4931 fish/cmds.c:4951
+#: fish/cmds.c:4991 fish/cmds.c:5048 fish/cmds.c:5069 fish/cmds.c:5090
+#: fish/cmds.c:5111 fish/cmds.c:5129 fish/cmds.c:5151 fish/cmds.c:5189
+#: fish/cmds.c:5211 fish/cmds.c:5290 fish/cmds.c:5329 fish/cmds.c:5344
+#: fish/cmds.c:5361 fish/cmds.c:5375 fish/cmds.c:5391 fish/cmds.c:5413
+#: fish/cmds.c:5435 fish/cmds.c:5457 fish/cmds.c:5479 fish/cmds.c:5501
+#: fish/cmds.c:5523 fish/cmds.c:5543 fish/cmds.c:5560 fish/cmds.c:5577
+#: fish/cmds.c:5596 fish/cmds.c:5615 fish/cmds.c:5635 fish/cmds.c:5671
+#: fish/cmds.c:5690 fish/cmds.c:5709 fish/cmds.c:5726 fish/cmds.c:5744
+#: fish/cmds.c:5767 fish/cmds.c:5790 fish/cmds.c:5814 fish/cmds.c:5837
+#: fish/cmds.c:5858 fish/cmds.c:5881 fish/cmds.c:5904 fish/cmds.c:5924
+#: fish/cmds.c:5946 fish/cmds.c:5967 fish/cmds.c:5990 fish/cmds.c:6007
+#: fish/cmds.c:6024 fish/cmds.c:6042 fish/cmds.c:6060 fish/cmds.c:6081
+#: fish/cmds.c:6099 fish/cmds.c:6120 fish/cmds.c:6140 fish/cmds.c:6158
+#: fish/cmds.c:6179 fish/cmds.c:6202 fish/cmds.c:6225 fish/cmds.c:6247
+#: fish/cmds.c:6280 fish/cmds.c:6297 fish/cmds.c:6314 fish/cmds.c:6338
+#: fish/cmds.c:6361 fish/cmds.c:6384 fish/cmds.c:6406 fish/cmds.c:6423
+#: fish/cmds.c:6445 fish/cmds.c:6539 fish/cmds.c:6559 fish/cmds.c:6579
+#: fish/cmds.c:6599 fish/cmds.c:6617 fish/cmds.c:6638 fish/cmds.c:6674
+#: fish/cmds.c:6691 fish/cmds.c:6713 fish/cmds.c:6730 fish/cmds.c:6766
+#: fish/cmds.c:6786 fish/cmds.c:6806 fish/cmds.c:6826 fish/cmds.c:6848
+#: fish/cmds.c:6865 fish/cmds.c:6884 fish/cmds.c:6903 fish/cmds.c:6925
+#: fish/cmds.c:6946 fish/cmds.c:6967 fish/cmds.c:6988 fish/cmds.c:7011
+#: fish/cmds.c:7052 fish/cmds.c:7075 fish/cmds.c:7114 fish/cmds.c:7131
+#: fish/cmds.c:7150 fish/cmds.c:7171 fish/cmds.c:7194 fish/cmds.c:7216
+#: fish/cmds.c:7234 fish/cmds.c:7253 fish/cmds.c:7274 fish/cmds.c:7351
+#: fish/cmds.c:7392 fish/cmds.c:7471 fish/cmds.c:7547 fish/cmds.c:7584
+#: fish/cmds.c:7607 fish/cmds.c:7628 fish/cmds.c:7651 fish/cmds.c:7673
+#: fish/cmds.c:7698 fish/cmds.c:7741 fish/cmds.c:7782 fish/cmds.c:7803
+#: fish/cmds.c:7821 fish/cmds.c:7840 fish/cmds.c:7857 fish/cmds.c:7875
+#: fish/cmds.c:7902 fish/cmds.c:7926 fish/cmds.c:7950 fish/cmds.c:7974
+#: fish/cmds.c:7998 fish/cmds.c:8022 fish/cmds.c:8046 fish/cmds.c:8070
+#: fish/cmds.c:8094 fish/cmds.c:8118 fish/cmds.c:8142 fish/cmds.c:8166
+#: fish/cmds.c:8189 fish/cmds.c:8212 fish/cmds.c:8233 fish/cmds.c:8254
+#: fish/cmds.c:8275 fish/cmds.c:8295 fish/cmds.c:8318 fish/cmds.c:8356
+#: fish/cmds.c:8373 fish/cmds.c:8390 fish/cmds.c:8409 fish/cmds.c:8428
+#: fish/cmds.c:8445 fish/cmds.c:8462 fish/cmds.c:8479 fish/cmds.c:8496
+#: fish/cmds.c:8515 fish/cmds.c:8551 fish/cmds.c:8591 fish/cmds.c:8624
+#: fish/cmds.c:8641 fish/cmds.c:8658 fish/cmds.c:8674 fish/cmds.c:8689
+#: fish/cmds.c:8710 fish/cmds.c:8748 fish/cmds.c:8786 fish/cmds.c:8825
+#: fish/cmds.c:8865 fish/cmds.c:8906 fish/cmds.c:8947 fish/cmds.c:8985
+#: fish/cmds.c:9002 fish/cmds.c:9025 fish/cmds.c:9047 fish/cmds.c:9069
+#: fish/cmds.c:9089 fish/cmds.c:9109 fish/cmds.c:9145 fish/cmds.c:9217
+#: fish/cmds.c:9257 fish/cmds.c:9315 fish/cmds.c:9341 fish/cmds.c:9367
+#: fish/cmds.c:9395 fish/cmds.c:9454 fish/cmds.c:9475 fish/cmds.c:9520
+#: fish/cmds.c:9540 fish/cmds.c:9579 fish/cmds.c:9616 fish/cmds.c:9636
+#: fish/cmds.c:9658 fish/cmds.c:9715 fish/cmds.c:9735 fish/cmds.c:9757
+#: fish/cmds.c:9779 fish/cmds.c:9798 fish/cmds.c:9818 fish/cmds.c:9845
+#: fish/cmds.c:9865 fish/cmds.c:9885 fish/cmds.c:9905 fish/cmds.c:9925
+#: fish/cmds.c:9947 fish/cmds.c:9982 fish/cmds.c:10000 fish/cmds.c:10023
+#: fish/cmds.c:10045 fish/cmds.c:10060 fish/cmds.c:10077 fish/cmds.c:10114
+#: fish/cmds.c:10153 fish/cmds.c:10193 fish/cmds.c:10249 fish/cmds.c:10271
+#: fish/cmds.c:10307 fish/cmds.c:10322 fish/cmds.c:10342 fish/cmds.c:10382
+#: fish/cmds.c:10405 fish/cmds.c:10429 fish/cmds.c:10454 fish/cmds.c:10495
+#: fish/cmds.c:10520 fish/cmds.c:10558 fish/cmds.c:10589 fish/cmds.c:10620
+#: fish/cmds.c:10648 fish/cmds.c:10668 fish/cmds.c:10700 fish/cmds.c:10720
+#: fish/cmds.c:10740 fish/cmds.c:10757 fish/cmds.c:10775 fish/cmds.c:10798
+#: fish/cmds.c:10819 fish/cmds.c:10838 fish/cmds.c:10880 fish/cmds.c:10923
+#: fish/cmds.c:10967 fish/cmds.c:11006 fish/cmds.c:11025 fish/cmds.c:11045
+#: fish/cmds.c:11065 fish/cmds.c:11086 fish/cmds.c:11107 fish/cmds.c:11128
+#: fish/cmds.c:11149 fish/cmds.c:11170 fish/cmds.c:11192 fish/cmds.c:11230
+#: fish/cmds.c:11281 fish/cmds.c:11319 fish/cmds.c:11375