Change `wordify' to `word-search-regexp'.

* lisp/isearch.el (isearch-occur): Use `word-search-regexp' for
`isearch-word'.
(isearch-search-and-update): Add condition for `isearch-word' and
call `word-search-regexp'. 

* src/search.c (Fword_search_regexp): New Lisp function created from
`wordify'.  Change type of arg `lax' from `int' to `Lisp_Object'.
(Fword_search_backward, Fword_search_forward)
(Fword_search_backward_lax, Fword_search_forward_lax):
Use `Fword_search_regexp' instead of `wordify'.  Doc fix.
(syms_of_search): Define `Sword_search_regexp'.

Fixes: debbugs:10145

2 files changed, 12 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4659d118789..43c232bc375 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-02  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-occur): Use `word-search-regexp' for
+        `isearch-word'.
+        (isearch-search-and-update): Add condition for `isearch-word' and
+        call `word-search-regexp'.  (Bug#10145)
+
 2011-12-01  Glenn Morris  <rgm@gnu.org>
 
         * eshell/em-hist.el (eshell-hist-initialize):
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 2a7f191bd81..f8aa8e4adc3 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1438,12 +1438,7 @@ string.  NLINES has the same meaning as in `occur'."
   (interactive
    (list
     (cond
-     (isearch-word (concat "\\b" (replace-regexp-in-string
-                                  "\\W+" "\\W+"
-                                  (replace-regexp-in-string
-                                   "^\\W+\\|\\W+$" "" isearch-string)
-                                  nil t)
-                           "\\b"))
+     (isearch-word (word-search-regexp isearch-string))
      (isearch-regexp isearch-string)
      (t (regexp-quote isearch-string)))
     (if current-prefix-arg (prefix-numeric-value current-prefix-arg))))
@@ -1642,8 +1637,10 @@ Subword is used when `subword-mode' is activated. "
                    (if (and (eq case-fold-search t) search-upper-case)
                        (setq case-fold-search
                              (isearch-no-upper-case-p isearch-string isearch-regexp)))
-                   (looking-at (if isearch-regexp isearch-string
-                                 (regexp-quote isearch-string))))
+                   (looking-at (cond
+                                (isearch-word (word-search-regexp isearch-string t))
+                                (isearch-regexp isearch-string)
+                                (t (regexp-quote isearch-string)))))
                (error nil))
              (or isearch-yank-flag
                  (<= (match-end 0)