* isearch.el (isearch-yank-word-or-char): Pull next subword

when `subword-mode' is activated.  (Bug#6220)

3 files changed, 12 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15dc5d2aa9a..4735ee6000b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-15  Masatake YAMATO  <yamato@redhat.com>
+
+        * isearch.el (isearch-yank-word-or-char): Pull next subword
+        when `subword-mode' is activated.  (Bug#6220)
+
 2010-05-20  Mark A. Hershberger  <mah@everybody.org>
 
         * isearch.el (isearch-update-post-hook): New hook.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index c44238ede24..ea5836edc4d 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1540,14 +1540,18 @@ or it might return the position of the end of the line."
   (interactive "p")
   (isearch-yank-internal (lambda () (forward-char arg) (point))))
 
+(declare-function subword-forward "subword" (&optional arg))
 (defun isearch-yank-word-or-char ()
-  "Pull next character or word from buffer into search string."
+  "Pull next character, subword or word from buffer into search string.
+Subword is used when `subword-mode' is activated. "
   (interactive)
   (isearch-yank-internal
    (lambda ()
      (if (or (= (char-syntax (or (char-after) 0)) ?w)
              (= (char-syntax (or (char-after (1+ (point))) 0)) ?w))
-         (forward-word 1)
+         (if (and (boundp 'subword-mode) subword-mode)
+             (subword-forward 1)
+           (forward-word 1))
        (forward-char 1)) (point))))
 
 (defun isearch-yank-word ()
diff --git a/lisp/progmodes/subword.el b/lisp/progmodes/subword.el
index 4081791ae2e..7df42c8b9a2 100644
--- a/lisp/progmodes/subword.el
+++ b/lisp/progmodes/subword.el
@@ -76,7 +76,7 @@
 ;; the old `c-forward-into-nomenclature' originally contributed by
 ;; Terry_Glanfield dot Southern at rxuk dot xerox dot com.
 
-;; TODO: ispell-word and subword oriented C-w in isearch.
+;; TODO: ispell-word.
 
 ;;; Code: