-#: fish/cmds.c:3438 fish/cmds.c:3452 fish/cmds.c:3468 fish/cmds.c:3485
-#: fish/cmds.c:3502 fish/cmds.c:3520 fish/cmds.c:3539 fish/cmds.c:3555
-#: fish/cmds.c:3573 fish/cmds.c:3589 fish/cmds.c:3607 fish/cmds.c:3623
-#: fish/cmds.c:3640 fish/cmds.c:3655 fish/cmds.c:3673 fish/cmds.c:3688
-#: fish/cmds.c:3704 fish/cmds.c:3720 fish/cmds.c:3736 fish/cmds.c:3752
-#: fish/cmds.c:3768 fish/cmds.c:3786 fish/cmds.c:3819 fish/cmds.c:3835
-#: fish/cmds.c:3851 fish/cmds.c:3870 fish/cmds.c:3885 fish/cmds.c:3903
-#: fish/cmds.c:3918 fish/cmds.c:3936 fish/cmds.c:3951 fish/cmds.c:3969
-#: fish/cmds.c:3984 fish/cmds.c:4003 fish/cmds.c:4022 fish/cmds.c:4040
-#: fish/cmds.c:4060 fish/cmds.c:4079 fish/cmds.c:4099 fish/cmds.c:4119
-#: fish/cmds.c:4139 fish/cmds.c:4158 fish/cmds.c:4177 fish/cmds.c:4197
-#: fish/cmds.c:4217 fish/cmds.c:4237 fish/cmds.c:4252 fish/cmds.c:4268
-#: fish/cmds.c:4289 fish/cmds.c:4340 fish/cmds.c:4358 fish/cmds.c:4375
-#: fish/cmds.c:4396 fish/cmds.c:4449 fish/cmds.c:4469 fish/cmds.c:4490
-#: fish/cmds.c:4506 fish/cmds.c:4522 fish/cmds.c:4541 fish/cmds.c:4563
-#: fish/cmds.c:4585 fish/cmds.c:4605 fish/cmds.c:4622 fish/cmds.c:4639
-#: fish/cmds.c:4656 fish/cmds.c:4673 fish/cmds.c:4690 fish/cmds.c:4707
-#: fish/cmds.c:4724 fish/cmds.c:4743 fish/cmds.c:4766 fish/cmds.c:4802
-#: fish/cmds.c:4819 fish/cmds.c:4842 fish/cmds.c:4864 fish/cmds.c:4885
-#: fish/cmds.c:4905 fish/cmds.c:4924 fish/cmds.c:4944 fish/cmds.c:4962
-#: fish/cmds.c:4980 fish/cmds.c:4994 fish/cmds.c:5010 fish/cmds.c:5030
-#: fish/cmds.c:5049 fish/cmds.c:5068 fish/cmds.c:5087 fish/cmds.c:5106
-#: fish/cmds.c:5126 fish/cmds.c:5166 fish/cmds.c:5223 fish/cmds.c:5244
-#: fish/cmds.c:5265 fish/cmds.c:5286 fish/cmds.c:5304 fish/cmds.c:5326
-#: fish/cmds.c:5364 fish/cmds.c:5386 fish/cmds.c:5465 fish/cmds.c:5504
-#: fish/cmds.c:5519 fish/cmds.c:5536 fish/cmds.c:5550 fish/cmds.c:5566
-#: fish/cmds.c:5588 fish/cmds.c:5610 fish/cmds.c:5632 fish/cmds.c:5654
-#: fish/cmds.c:5676 fish/cmds.c:5698 fish/cmds.c:5718 fish/cmds.c:5735
-#: fish/cmds.c:5752 fish/cmds.c:5771 fish/cmds.c:5790 fish/cmds.c:5810
-#: fish/cmds.c:5846 fish/cmds.c:5865 fish/cmds.c:5884 fish/cmds.c:5901
-#: fish/cmds.c:5919 fish/cmds.c:5942 fish/cmds.c:5965 fish/cmds.c:5989
-#: fish/cmds.c:6012 fish/cmds.c:6033 fish/cmds.c:6056 fish/cmds.c:6079
-#: fish/cmds.c:6099 fish/cmds.c:6121 fish/cmds.c:6142 fish/cmds.c:6165
-#: fish/cmds.c:6182 fish/cmds.c:6199 fish/cmds.c:6217 fish/cmds.c:6235
-#: fish/cmds.c:6256 fish/cmds.c:6274 fish/cmds.c:6295 fish/cmds.c:6315
-#: fish/cmds.c:6333 fish/cmds.c:6354 fish/cmds.c:6377 fish/cmds.c:6400
-#: fish/cmds.c:6422 fish/cmds.c:6455 fish/cmds.c:6472 fish/cmds.c:6489
-#: fish/cmds.c:6513 fish/cmds.c:6536 fish/cmds.c:6559 fish/cmds.c:6581
-#: fish/cmds.c:6598 fish/cmds.c:6620 fish/cmds.c:6714 fish/cmds.c:6734
-#: fish/cmds.c:6754 fish/cmds.c:6774 fish/cmds.c:6792 fish/cmds.c:6813
-#: fish/cmds.c:6849 fish/cmds.c:6866 fish/cmds.c:6888 fish/cmds.c:6905
-#: fish/cmds.c:6941 fish/cmds.c:6961 fish/cmds.c:6981 fish/cmds.c:7001
-#: fish/cmds.c:7023 fish/cmds.c:7040 fish/cmds.c:7059 fish/cmds.c:7078
-#: fish/cmds.c:7100 fish/cmds.c:7121 fish/cmds.c:7142 fish/cmds.c:7163
-#: fish/cmds.c:7186 fish/cmds.c:7227 fish/cmds.c:7250 fish/cmds.c:7289
-#: fish/cmds.c:7306 fish/cmds.c:7325 fish/cmds.c:7346 fish/cmds.c:7369
-#: fish/cmds.c:7391 fish/cmds.c:7409 fish/cmds.c:7428 fish/cmds.c:7449
-#: fish/cmds.c:7526 fish/cmds.c:7567 fish/cmds.c:7646 fish/cmds.c:7722
-#: fish/cmds.c:7759 fish/cmds.c:7782 fish/cmds.c:7803 fish/cmds.c:7826
-#: fish/cmds.c:7848 fish/cmds.c:7873 fish/cmds.c:7916 fish/cmds.c:7957
-#: fish/cmds.c:7978 fish/cmds.c:7996 fish/cmds.c:8015 fish/cmds.c:8032
-#: fish/cmds.c:8050 fish/cmds.c:8077 fish/cmds.c:8101 fish/cmds.c:8125
-#: fish/cmds.c:8149 fish/cmds.c:8173 fish/cmds.c:8197 fish/cmds.c:8221
-#: fish/cmds.c:8245 fish/cmds.c:8269 fish/cmds.c:8293 fish/cmds.c:8317
-#: fish/cmds.c:8341 fish/cmds.c:8364 fish/cmds.c:8387 fish/cmds.c:8408
-#: fish/cmds.c:8429 fish/cmds.c:8450 fish/cmds.c:8470 fish/cmds.c:8493
-#: fish/cmds.c:8531 fish/cmds.c:8548 fish/cmds.c:8565 fish/cmds.c:8584
-#: fish/cmds.c:8603 fish/cmds.c:8620 fish/cmds.c:8637 fish/cmds.c:8654
-#: fish/cmds.c:8671 fish/cmds.c:8690 fish/cmds.c:8726 fish/cmds.c:8766
-#: fish/cmds.c:8799 fish/cmds.c:8816 fish/cmds.c:8833 fish/cmds.c:8849
-#: fish/cmds.c:8864 fish/cmds.c:8885 fish/cmds.c:8923 fish/cmds.c:8961
-#: fish/cmds.c:9000 fish/cmds.c:9040 fish/cmds.c:9081 fish/cmds.c:9122
-#: fish/cmds.c:9160 fish/cmds.c:9177 fish/cmds.c:9200 fish/cmds.c:9222
-#: fish/cmds.c:9244 fish/cmds.c:9264 fish/cmds.c:9284 fish/cmds.c:9320
-#: fish/cmds.c:9392 fish/cmds.c:9432 fish/cmds.c:9490 fish/cmds.c:9516
-#: fish/cmds.c:9542 fish/cmds.c:9570 fish/cmds.c:9629 fish/cmds.c:9650
-#: fish/cmds.c:9695 fish/cmds.c:9715 fish/cmds.c:9754 fish/cmds.c:9791
-#: fish/cmds.c:9811 fish/cmds.c:9833 fish/cmds.c:9890 fish/cmds.c:9910
-#: fish/cmds.c:9932 fish/cmds.c:9954 fish/cmds.c:9973 fish/cmds.c:9993
-#: fish/cmds.c:10020 fish/cmds.c:10040 fish/cmds.c:10060 fish/cmds.c:10080
-#: fish/cmds.c:10100 fish/cmds.c:10122 fish/cmds.c:10157 fish/cmds.c:10175
-#: fish/cmds.c:10198 fish/cmds.c:10220 fish/cmds.c:10235 fish/cmds.c:10252
-#: fish/cmds.c:10289 fish/cmds.c:10328 fish/cmds.c:10368 fish/cmds.c:10424
-#: fish/cmds.c:10446 fish/cmds.c:10482 fish/cmds.c:10497 fish/cmds.c:10517
-#: fish/cmds.c:10557 fish/cmds.c:10580 fish/cmds.c:10604 fish/cmds.c:10629
-#: fish/cmds.c:10670 fish/cmds.c:10695 fish/cmds.c:10733 fish/cmds.c:10764
-#: fish/cmds.c:10795 fish/cmds.c:10823 fish/cmds.c:10843 fish/cmds.c:10875
-#: fish/cmds.c:10895 fish/cmds.c:10915 fish/cmds.c:10932 fish/cmds.c:10950
-#: fish/cmds.c:10973 fish/cmds.c:10994 fish/cmds.c:11013 fish/cmds.c:11055
-#: fish/cmds.c:11098 fish/cmds.c:11142 fish/cmds.c:11181 fish/cmds.c:11200
-#: fish/cmds.c:11220 fish/cmds.c:11240 fish/cmds.c:11261 fish/cmds.c:11282
-#: fish/cmds.c:11303 fish/cmds.c:11324 fish/cmds.c:11345 fish/cmds.c:11367
-#: fish/cmds.c:11405 fish/cmds.c:11456 fish/cmds.c:11494 fish/cmds.c:11550
+#: fish/cmds.c:3135 fish/cmds.c:3149 fish/cmds.c:3165 fish/cmds.c:3182
+#: fish/cmds.c:3199 fish/cmds.c:3217 fish/cmds.c:3236 fish/cmds.c:3252
+#: fish/cmds.c:3270 fish/cmds.c:3286 fish/cmds.c:3304 fish/cmds.c:3320
+#: fish/cmds.c:3337 fish/cmds.c:3352 fish/cmds.c:3370 fish/cmds.c:3385
+#: fish/cmds.c:3401 fish/cmds.c:3417 fish/cmds.c:3433 fish/cmds.c:3449
+#: fish/cmds.c:3465 fish/cmds.c:3483 fish/cmds.c:3516 fish/cmds.c:3532
+#: fish/cmds.c:3548 fish/cmds.c:3567 fish/cmds.c:3582 fish/cmds.c:3600
+#: fish/cmds.c:3615 fish/cmds.c:3633 fish/cmds.c:3648 fish/cmds.c:3666
+#: fish/cmds.c:3681 fish/cmds.c:3700 fish/cmds.c:3719 fish/cmds.c:3737
+#: fish/cmds.c:3757 fish/cmds.c:3776 fish/cmds.c:3796 fish/cmds.c:3816
+#: fish/cmds.c:3836 fish/cmds.c:3855 fish/cmds.c:3874 fish/cmds.c:3894
+#: fish/cmds.c:3914 fish/cmds.c:3934 fish/cmds.c:3949 fish/cmds.c:3965
+#: fish/cmds.c:3986 fish/cmds.c:4037 fish/cmds.c:4055 fish/cmds.c:4072
+#: fish/cmds.c:4093 fish/cmds.c:4146 fish/cmds.c:4166 fish/cmds.c:4186
+#: fish/cmds.c:4206 fish/cmds.c:4227 fish/cmds.c:4243 fish/cmds.c:4259
+#: fish/cmds.c:4278 fish/cmds.c:4300 fish/cmds.c:4322 fish/cmds.c:4342
+#: fish/cmds.c:4359 fish/cmds.c:4376 fish/cmds.c:4393 fish/cmds.c:4410
+#: fish/cmds.c:4427 fish/cmds.c:4444 fish/cmds.c:4461 fish/cmds.c:4480
+#: fish/cmds.c:4503 fish/cmds.c:4539 fish/cmds.c:4556 fish/cmds.c:4579
+#: fish/cmds.c:4601 fish/cmds.c:4622 fish/cmds.c:4642 fish/cmds.c:4661
+#: fish/cmds.c:4681 fish/cmds.c:4699 fish/cmds.c:4717 fish/cmds.c:4731
+#: fish/cmds.c:4747 fish/cmds.c:4767 fish/cmds.c:4786 fish/cmds.c:4805
+#: fish/cmds.c:4824 fish/cmds.c:4843 fish/cmds.c:4863 fish/cmds.c:4903
+#: fish/cmds.c:4960 fish/cmds.c:4981 fish/cmds.c:5002 fish/cmds.c:5023
+#: fish/cmds.c:5041 fish/cmds.c:5063 fish/cmds.c:5101 fish/cmds.c:5123
+#: fish/cmds.c:5202 fish/cmds.c:5241 fish/cmds.c:5256 fish/cmds.c:5273
+#: fish/cmds.c:5287 fish/cmds.c:5303 fish/cmds.c:5325 fish/cmds.c:5347
+#: fish/cmds.c:5369 fish/cmds.c:5391 fish/cmds.c:5413 fish/cmds.c:5435
+#: fish/cmds.c:5455 fish/cmds.c:5472 fish/cmds.c:5489 fish/cmds.c:5508
+#: fish/cmds.c:5527 fish/cmds.c:5547 fish/cmds.c:5583 fish/cmds.c:5602
+#: fish/cmds.c:5621 fish/cmds.c:5638 fish/cmds.c:5656 fish/cmds.c:5679
+#: fish/cmds.c:5702 fish/cmds.c:5726 fish/cmds.c:5749 fish/cmds.c:5770
+#: fish/cmds.c:5793 fish/cmds.c:5816 fish/cmds.c:5836 fish/cmds.c:5858
+#: fish/cmds.c:5879 fish/cmds.c:5902 fish/cmds.c:5919 fish/cmds.c:5936
+#: fish/cmds.c:5954 fish/cmds.c:5972 fish/cmds.c:5993 fish/cmds.c:6011
+#: fish/cmds.c:6032 fish/cmds.c:6052 fish/cmds.c:6070 fish/cmds.c:6091
+#: fish/cmds.c:6114 fish/cmds.c:6137 fish/cmds.c:6159 fish/cmds.c:6192
+#: fish/cmds.c:6209 fish/cmds.c:6226 fish/cmds.c:6250 fish/cmds.c:6273
+#: fish/cmds.c:6296 fish/cmds.c:6318 fish/cmds.c:6335 fish/cmds.c:6357
+#: fish/cmds.c:6451 fish/cmds.c:6471 fish/cmds.c:6491 fish/cmds.c:6511
+#: fish/cmds.c:6529 fish/cmds.c:6550 fish/cmds.c:6586 fish/cmds.c:6603
+#: fish/cmds.c:6625 fish/cmds.c:6642 fish/cmds.c:6678 fish/cmds.c:6698
+#: fish/cmds.c:6718 fish/cmds.c:6738 fish/cmds.c:6760 fish/cmds.c:6777
+#: fish/cmds.c:6796 fish/cmds.c:6815 fish/cmds.c:6837 fish/cmds.c:6858
+#: fish/cmds.c:6879 fish/cmds.c:6900 fish/cmds.c:6923 fish/cmds.c:6964
+#: fish/cmds.c:6987 fish/cmds.c:7026 fish/cmds.c:7043 fish/cmds.c:7062
+#: fish/cmds.c:7083 fish/cmds.c:7106 fish/cmds.c:7128 fish/cmds.c:7146
+#: fish/cmds.c:7165 fish/cmds.c:7186 fish/cmds.c:7263 fish/cmds.c:7304
+#: fish/cmds.c:7383 fish/cmds.c:7459 fish/cmds.c:7496 fish/cmds.c:7519
+#: fish/cmds.c:7540 fish/cmds.c:7563 fish/cmds.c:7585 fish/cmds.c:7610
+#: fish/cmds.c:7653 fish/cmds.c:7694 fish/cmds.c:7715 fish/cmds.c:7733
+#: fish/cmds.c:7752 fish/cmds.c:7769 fish/cmds.c:7787 fish/cmds.c:7814
+#: fish/cmds.c:7838 fish/cmds.c:7862 fish/cmds.c:7886 fish/cmds.c:7910
+#: fish/cmds.c:7934 fish/cmds.c:7958 fish/cmds.c:7982 fish/cmds.c:8006
+#: fish/cmds.c:8030 fish/cmds.c:8054 fish/cmds.c:8078 fish/cmds.c:8101
+#: fish/cmds.c:8124 fish/cmds.c:8145 fish/cmds.c:8166 fish/cmds.c:8187
+#: fish/cmds.c:8207 fish/cmds.c:8230 fish/cmds.c:8268 fish/cmds.c:8285
+#: fish/cmds.c:8302 fish/cmds.c:8321 fish/cmds.c:8340 fish/cmds.c:8357
+#: fish/cmds.c:8374 fish/cmds.c:8391 fish/cmds.c:8408 fish/cmds.c:8427
+#: fish/cmds.c:8463 fish/cmds.c:8503 fish/cmds.c:8536 fish/cmds.c:8553
+#: fish/cmds.c:8570 fish/cmds.c:8586 fish/cmds.c:8601 fish/cmds.c:8622
+#: fish/cmds.c:8660 fish/cmds.c:8698 fish/cmds.c:8737 fish/cmds.c:8777
+#: fish/cmds.c:8818 fish/cmds.c:8859 fish/cmds.c:8897 fish/cmds.c:8914
+#: fish/cmds.c:8937 fish/cmds.c:8959 fish/cmds.c:8981 fish/cmds.c:9001
+#: fish/cmds.c:9021 fish/cmds.c:9057 fish/cmds.c:9129 fish/cmds.c:9169
+#: fish/cmds.c:9227 fish/cmds.c:9253 fish/cmds.c:9279 fish/cmds.c:9307
+#: fish/cmds.c:9366 fish/cmds.c:9387 fish/cmds.c:9432 fish/cmds.c:9452
+#: fish/cmds.c:9491 fish/cmds.c:9528 fish/cmds.c:9548 fish/cmds.c:9570
+#: fish/cmds.c:9627 fish/cmds.c:9647 fish/cmds.c:9669 fish/cmds.c:9691
+#: fish/cmds.c:9710 fish/cmds.c:9730 fish/cmds.c:9757 fish/cmds.c:9777
+#: fish/cmds.c:9797 fish/cmds.c:9817 fish/cmds.c:9837 fish/cmds.c:9859
+#: fish/cmds.c:9894 fish/cmds.c:9912 fish/cmds.c:9935 fish/cmds.c:9957
+#: fish/cmds.c:9972 fish/cmds.c:9989 fish/cmds.c:10026 fish/cmds.c:10065
+#: fish/cmds.c:10105 fish/cmds.c:10161 fish/cmds.c:10183 fish/cmds.c:10219
+#: fish/cmds.c:10234 fish/cmds.c:10254 fish/cmds.c:10294 fish/cmds.c:10317
+#: fish/cmds.c:10341 fish/cmds.c:10366 fish/cmds.c:10407 fish/cmds.c:10432
+#: fish/cmds.c:10470 fish/cmds.c:10501 fish/cmds.c:10532 fish/cmds.c:10560
+#: fish/cmds.c:10580 fish/cmds.c:10612 fish/cmds.c:10632 fish/cmds.c:10652
+#: fish/cmds.c:10669 fish/cmds.c:10687 fish/cmds.c:10710 fish/cmds.c:10731
+#: fish/cmds.c:10750 fish/cmds.c:10792 fish/cmds.c:10835 fish/cmds.c:10879
+#: fish/cmds.c:10918 fish/cmds.c:10937 fish/cmds.c:10957 fish/cmds.c:10977
+#: fish/cmds.c:10998 fish/cmds.c:11019 fish/cmds.c:11040 fish/cmds.c:11061
+#: fish/cmds.c:11082 fish/cmds.c:11104 fish/cmds.c:11142 fish/cmds.c:11193
+#: fish/cmds.c:11231 fish/cmds.c:11287