andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/isearch.el (isearch-pre-command-hook): Default to shift-translated

Browse source 
move commands that can be enabled by the `isearch-move' property `enabled',
and disabled by `disabled'.
(search-exit-option): Doc fix.
(isearch-post-command-hook): Check for isearch-forward.
https://lists.gnu.org/archive/html/emacs-devel/2018-03/msg00438.html
This commit is contained in:
Juri Linkov 2018-04-04 23:49:45 +03:00
parent 25b22772a7
commit c26054bbfe
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lisp/isearch.el
View file

@ -72,7 +72,9 @@ If t, random control and meta characters terminate the search
and are then executed normally.
If `edit', edit the search string instead of exiting.
If `move', extend the search string by motion commands
that have the `isearch-move' property on their symbols.
that have the `isearch-move' property on their symbols
equal to `enabled', or the shift-translated command is
not disabled by the value `disabled' of the same property.
If `shift-move', extend the search string by motion commands
while holding down the shift key.
Both `move' and `shift-move' extend the search string by yanking text
@ -2434,7 +2436,10 @@ See more for options in `search-exit-option'."
;; Don't terminate the search for motion commands.
((or (and (eq search-exit-option 'move)
(symbolp this-command)
(eq (get this-command 'isearch-move) t))
(or (eq (get this-command 'isearch-move) 'enabled)
(and (not (eq (get this-command 'isearch-move) 'disabled))
(stringp (nth 1 (interactive-form this-command)))
(string-match-p "^^" (nth 1 (interactive-form this-command))))))
(and (eq search-exit-option 'shift-move)
this-command-keys-shift-translated))
(setq this-command-keys-shift-translated nil)
@ -2469,7 +2474,8 @@ See more for options in `search-exit-option'."
string ""))
(setq isearch-yank-flag t)
(setq isearch-forward (<= (or isearch-other-end isearch-opoint) (point)))
(goto-char isearch-pre-move-point)
(when isearch-forward
(goto-char isearch-pre-move-point))
(isearch-search-and-update)))
(setq isearch-pre-move-point nil))))