From 15e82518d341251ec5b43ddf966b55d1c578681f Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Sun, 3 Apr 2016 18:25:48 +0100
Subject: [PATCH] Tweak categorize(Codepoint) implementation

---
 src/unicode.hh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/unicode.hh b/src/unicode.hh
index a3c9313d..9b65e265 100644
--- a/src/unicode.hh
+++ b/src/unicode.hh
@@ -58,14 +58,13 @@ enum class CharCategories
 template<WordType word_type = Word>
 inline CharCategories categorize(Codepoint c)
 {
-    if (is_word(c))
-        return CharCategories::Word;
     if (is_eol(c))
         return CharCategories::EndOfLine;
     if (is_horizontal_blank(c))
         return CharCategories::Blank;
-    return word_type == WORD ? CharCategories::Word
-                             : CharCategories::Punctuation;
+    if (word_type == WORD or is_word(c))
+        return CharCategories::Word;
+    return CharCategories::Punctuation;
 }
 
 inline Codepoint to_lower(Codepoint cp) { return towlower((wchar_t)cp); }