Remove unnecessary explicit subword-mode use from isearch

* lisp/isearch.el (isearch-yank-word-or-char): Remove explicit
use of subword-mode. These days, subword-mode use is an
automatic side effect of forward-word.

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 41350c2d303300a3d1277fb53792636120b48a2f..1835469bb2c316b41fa2b4842c402abc7267f5a3 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2089,19 +2089,14 @@ If optional ARG is non-nil, pull in the next ARG characters."
   (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, subword or word from buffer into search string.
-Subword is used when `subword-mode' is activated. "
+  "Pull next character or word from buffer into search string."
   (interactive)
   (isearch-yank-internal
    (lambda ()
      (if (or (= (char-syntax (or (char-after) 0)) ?w)
              (= (char-syntax (or (char-after (1+ (point))) 0)) ?w))
-        (if (or (and (boundp 'subword-mode) subword-mode)
-                (and (boundp 'superword-mode) superword-mode))
-            (subword-forward 1)
-          (forward-word 1))
+        (forward-word 1)
        (forward-char 1))
      (point))))