Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
1ddb2ea0
Commit
1ddb2ea0
authored
May 21, 2010
by
Masatake YAMATO
Committed by
Juri Linkov
May 21, 2010
Browse files
* isearch.el (isearch-yank-word-or-char): Pull next subword
when `subword-mode' is activated. (Bug#6220)
parent
a6020335
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/isearch.el
lisp/isearch.el
+6
-2
lisp/progmodes/subword.el
lisp/progmodes/subword.el
+1
-1
No files found.
lisp/ChangeLog
View file @
1ddb2ea0
2009-12-15 Masatake YAMATO <yamato@redhat.com>
* isearch.el (isearch-yank-word-or-char): Pull next subword
when `subword-mode' is activated. (Bug#6220)
2010-05-20 Mark A. Hershberger <mah@everybody.org>
* isearch.el (isearch-update-post-hook): New hook.
...
...
lisp/isearch.el
View file @
1ddb2ea0
...
...
@@ -1540,14 +1540,18 @@ or it might return the position of the end of the line."
(interactive "p")
(isearch-yank-internal (lambda () (forward-char arg) (point))))
(declare-function subword-forward "subword" (&optional arg))
(defun isearch-yank-word-or-char ()
"Pull next character or word from buffer into search string."
"Pull next character, subword or word from buffer into search string.
Subword is used when `subword-mode' is activated. "
(interactive)
(isearch-yank-internal
(lambda ()
(if (or (= (char-syntax (or (char-after) 0)) ?w)
(= (char-syntax (or (char-after (1+ (point))) 0)) ?w))
(forward-word 1)
(if (and (boundp 'subword-mode) subword-mode)
(subword-forward 1)
(forward-word 1))
(forward-char 1)) (point))))
(defun isearch-yank-word ()
...
...
lisp/progmodes/subword.el
View file @
1ddb2ea0
...
...
@@ -76,7 +76,7 @@
;; the old `c-forward-into-nomenclature' originally contributed by
;; Terry_Glanfield dot Southern at rxuk dot xerox dot com.
;; TODO: ispell-word
and subword oriented C-w in isearch
.
;; TODO: ispell-word.
;;; Code:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment