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)
 Conflicts:
contrib/libedit/src/chartype.h
contrib/libedit/src/eln.c
contrib/libedit/src/filecomplete.c
contrib/libedit/src/sys.h

1  2 
contrib/libedit/src/chartype.h
contrib/libedit/src/el.c
contrib/libedit/src/sys.h

@@@ -44,9 -33,7 +33,9 @@@
   * supports non-BMP code points without requiring UTF-16, but nothing
   * seems to actually advertise this properly, despite Unicode 3.1 having
   * been around since 2001... */
- #if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__)
 +
 +#if 0 /* DragonFly wchar supports ISO 10646 */
+ #if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
  #ifndef __STDC_ISO_10646__
  /* In many places it is assumed that the first 127 code points are ASCII
   * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
Simple merge
Simple merge