From: Daniel Colascione <dancol@dancol.org>
Date: Fri, 23 Feb 2018 01:28:38 +0000 (-0800)
Subject: Remove unnecessary explicit subword-mode use from isearch
X-Git-Tag: emacs-27.0.90~5638
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b7542b2a0a00adc8d216697db0b8afd8d568de00;p=emacs.git

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 41350c2d303..1835469bb2c 100644
--- 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))))