diff options
| author | Lars Ljung <lars@matholka.se> | 2014-09-04 12:14:26 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-09-04 12:14:26 -0400 |
| commit | bcbaf6b7be2f42b29804226d3448b84e84624438 (patch) | |
| tree | 1fab0d0f2381da61ea409f8c946fb02c32e24280 | |
| parent | 3084e597f4586b0a075dfe3eb56f1c729406266b (diff) | |
| download | emacs-bcbaf6b7be2f42b29804226d3448b84e84624438.tar.gz | |
* lisp/isearch.el (isearch-yank-word-or-char): Obey superword-mode
as well.
Fixes: debbugs:18400
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/isearch.el | 6 |
2 files changed, 9 insertions, 2 deletions
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. |