* lisp/isearch.el (isearch-yank-word-or-char): Obey superword-mode

as well.

Fixes: debbugs:18400

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c716ac8dc0a8b7f68b1530200467a492b6fd3592..0178819df3bf993ed9c2fef2800b458762405a27 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-04  Lars Ljung  <lars@matholka.se>  (tiny change)
+
+       * isearch.el (isearch-yank-word-or-char): Obey superword-mode
+       as well (bug#18400).
+
 2014-09-04  Eli Zaretskii  <eliz@gnu.org>
 
        * subr.el (posn-actual-col-row): Doc fix.  (Bug#18385)

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 20dabdc5b6c2085411710bc5622364d87cb58fcf..9bee5aa7eb07db95c619c5d33e68c179415a78bb 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1968,10 +1968,12 @@ Subword is used when `subword-mode' is activated. "
    (lambda ()
      (if (or (= (char-syntax (or (char-after) 0)) ?w)
              (= (char-syntax (or (char-after (1+ (point))) 0)) ?w))
-        (if (and (boundp 'subword-mode) subword-mode)
+        (if (or (and (boundp 'subword-mode) subword-mode)
+                (and (boundp 'superword-mode) superword-mode))
             (subword-forward 1)
           (forward-word 1))
-       (forward-char 1)) (point))))
+       (forward-char 1))
+     (point))))
 
 (defun isearch-yank-word (&optional arg)
   "Pull next word from buffer into search string.