subword handling in isearch-yank-word-or-char

[Masatake YAMATO]

Hi,

Could you add following small modification to emacs source tree?

With the patch you can pull a subword as yank text when you do
\C-w in isearch.

Masatake YAMATO

--- ChangeLog   14 Dec 2009 23:22:54 -0000      1.16907
+++ ChangeLog   15 Dec 2009 08:58:40 -0000
@@ -1,3 +1,8 @@
+2009-12-15  Masatake YAMATO  <address@hidden>
+
+       * isearch.el (isearch-yank-word-or-char): Pull next subword
+       when `subword-mode' is activated.
+
 2009-12-14  Chong Yidong  <address@hidden>
 
        * Makefile.in: Revert last change (Bug#5191).
--- isearch.el  7 Dec 2009 17:30:05 -0000       1.351
+++ isearch.el  15 Dec 2009 08:58:40 -0000
@@ -1538,14 +1538,18 @@
   (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 (fboundp 'subword-mode) subword-mode)
+            (subword-forward 1)
+            (forward-word 1))
        (forward-char 1)) (point))))
 
 (defun isearch-yank-word ()
--- progmodes/subword.el        1 Dec 2009 09:28:23 -0000       1.3
+++ progmodes/subword.el        15 Dec 2009 08:58:40 -0000
@@ -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: