aboutsummaryrefslogtreecommitdiff
path: root/src/common/wchar.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/wchar.c')
-rw-r--r--src/common/wchar.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/wchar.c b/src/common/wchar.c
index fa8854d9e9f..3b3fc53009f 100644
--- a/src/common/wchar.c
+++ b/src/common/wchar.c
@@ -620,7 +620,7 @@ mbbisearch(pg_wchar ucs, const struct mbinterval *table, int max)
* value of -1.
*
* - Non-spacing and enclosing combining characters (general
- * category code Mn or Me in the Unicode database) have a
+ * category code Mn, Me or Cf in the Unicode database) have a
* column width of 0.
*
* - Spacing characters in the East Asian Wide (W) or East Asian
@@ -638,7 +638,7 @@ mbbisearch(pg_wchar ucs, const struct mbinterval *table, int max)
static int
ucs_wcwidth(pg_wchar ucs)
{
-#include "common/unicode_combining_table.h"
+#include "common/unicode_nonspacing_table.h"
#include "common/unicode_east_asian_fw_table.h"
/* test for 8-bit control characters */
@@ -657,8 +657,8 @@ ucs_wcwidth(pg_wchar ucs)
* factor for display width leads to the correct behavior, so do that
* search first.
*/
- if (mbbisearch(ucs, combining,
- sizeof(combining) / sizeof(struct mbinterval) - 1))
+ if (mbbisearch(ucs, nonspacing,
+ sizeof(nonspacing) / sizeof(struct mbinterval) - 1))
return 0;
/* binary search in table of wide characters */