From: Lars Ljung <lars@matholka.se>
Date: Thu, 4 Sep 2014 16:14:26 +0000 (-0400)
Subject: * lisp/isearch.el (isearch-yank-word-or-char): Obey superword-mode
X-Git-Tag: emacs-24.3.94~53
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bcbaf6b7be2f42b29804226d3448b84e84624438;p=emacs.git

* 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 c716ac8dc0a..0178819df3b 100644
--- 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 20dabdc5b6c..9bee5aa7eb0 100644
--- 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.