[Emacs-diffs] /srv/bzr/emacs/trunk r100387: * isearch.el (isearch-yank-word-or-char): Pull next subword

[Juri Linkov]

------------------------------------------------------------
revno: 100387
author: Masatake YAMATO  <address@hidden>
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Fri 2010-05-21 01:33:09 +0300
message:
  * isearch.el (isearch-yank-word-or-char): Pull next subword
  when `subword-mode' is activated.  (Bug#6220)
modified:
  lisp/ChangeLog
  lisp/isearch.el
  lisp/progmodes/subword.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-20 22:16:19 +0000
+++ b/lisp/ChangeLog    2010-05-20 22:33:09 +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.  (Bug#6220)
+
 2010-05-20  Mark A. Hershberger  <address@hidden>
 
        * isearch.el (isearch-update-post-hook): New hook.

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2010-05-20 22:16:19 +0000
+++ b/lisp/isearch.el   2010-05-20 22:33:09 +0000
@@ -1540,14 +1540,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 (boundp 'subword-mode) subword-mode)
+            (subword-forward 1)
+          (forward-word 1))
        (forward-char 1)) (point))))
 
 (defun isearch-yank-word ()

=== modified file 'lisp/progmodes/subword.el'
--- a/lisp/progmodes/subword.el 2010-01-13 08:35:10 +0000
+++ b/lisp/progmodes/subword.el 2010-05-20 22:33:09 +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: