Ticket #1495: mc-4.7.0-pre1.search.patch

src/search/normal.c

@@ -91 +91 @@
         mc_search__normal_translate_to_regex (mc_search_cond->str->str, &mc_search_cond->len);
 
     g_string_free (mc_search_cond->str, TRUE);
+
+    if (mc_search->whole_words) {
+        g_string_prepend (tmp, "\\b");
+        g_string_append (tmp, "\\b");
+    }
     mc_search_cond->str = tmp;
 
     mc_search__cond_struct_new_init_regex (charset, mc_search, mc_search_cond);

src/search/regex.c

@@ -63 +63 @@
     const char *special_chars[] = {
         "\\s", "\\S",
         "\\d", "\\D",
-        "\\B", "\\B",
+        "\\b", "\\B",
         "\\w", "\\W",
         "\\t", "\\n",
         "\\r", "\\f",

src/search/search.h

@@ -63 +63 @@
     /* search entire string (from begin to end). Used only with GLOB search type */
     gboolean is_entire_line;
 
+    /* search entire string (from begin to end). Used only with NORMAL search type */
+    gboolean whole_words;
+
     /* function, used for getting data. NULL if not used */
     mc_search_fn search_fn;