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

as well.

Fixes: debbugs:18400
This commit is contained in:
Lars Ljung 2014-09-04 12:14:26 -04:00 committed by Stefan Monnier
parent 3084e597f4
commit bcbaf6b7be
2 changed files with 9 additions and 2 deletions

View file

@ -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)

View file

@ -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.