[Emacs-diffs] emacs-24 r117482: * lisp/isearch.el (isearch-yank-word-or-char): Obey superword-mode

[Stefan Monnier]

------------------------------------------------------------
revno: 117482
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18400
author: Lars Ljung <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-09-04 12:14:26 -0400
message:
  * lisp/isearch.el (isearch-yank-word-or-char): Obey superword-mode
  as well.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/isearch.el                isearch.el-20091113204419-o5vbwnq5f7feedwu-486

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-09-04 15:21:40 +0000
+++ b/lisp/ChangeLog    2014-09-04 16:14:26 +0000
@@ -1,3 +1,8 @@
+2014-09-04  Lars Ljung  <address@hidden>  (tiny change)
+
+       * isearch.el (isearch-yank-word-or-char): Obey superword-mode
+       as well (bug#18400).
+
 2014-09-04  Eli Zaretskii  <address@hidden>
 
        * subr.el (posn-actual-col-row): Doc fix.  (Bug#18385)

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2014-03-01 02:48:54 +0000
+++ b/lisp/isearch.el   2014-09-04 16:14:26 +0000
@@ -1968,10 +1968,12 @@
    (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.