Merge remote-tracking branch 'origin/vendor/LIBEDIT'
authorzrj <zrj@dragonflybsd.org>
Tue, 30 Apr 2019 17:59:56 +0000 (20:59 +0300)
committerzrj <zrj@dragonflybsd.org>
Tue, 30 Apr 2019 17:59:56 +0000 (20:59 +0300)
commit30baa437bb9bd1152f19689c2d0442f652174e87
treeb8f8f4df6662ec695ae7020df3364feafe198501
parent02aa41ec2539e6bd53a7ebc8fdd9b77e10c21097
parent12db70c8662d940c359926621f5dcef8a2365781
Merge remote-tracking branch 'origin/vendor/LIBEDIT'

 Conflicts:
contrib/libedit/src/chartype.h
contrib/libedit/src/eln.c
contrib/libedit/src/filecomplete.c
contrib/libedit/src/sys.h
contrib/libedit/src/chartype.h
contrib/libedit/src/el.c
contrib/libedit/src/sys.h