Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use the inherit-input-method argument of read-char #858

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use the inherit-input-method argument of read-char #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions evil-commands.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ Columns are counted from zero."
:keep-visual t
:repeat nil
:type exclusive
(interactive (list (read-char)))
(interactive (list (read-char nil t)))
(let ((marker (evil-get-marker char)))
(cond
((markerp marker)
Expand All @@ -756,7 +756,7 @@ Columns are counted from zero."
:keep-visual t
:repeat nil
:type line
(interactive (list (read-char)))
(interactive (list (read-char nil t)))
(evil-goto-mark char noerror)
(evil-first-non-blank))

Expand Down Expand Up @@ -2002,7 +2002,7 @@ The return value is the yanked text."
(put-text-property 0 1 'face 'minibuffer-prompt string)
(put-text-property 0 1 'cursor t string)
(overlay-put overlay 'after-string string)
(list (or evil-this-register (read-char))))
(list (or evil-this-register (read-char nil t))))
(delete-overlay overlay))))
(when (evil-paste-before nil register t)
;; go to end of pasted text
Expand Down Expand Up @@ -2087,7 +2087,7 @@ when called interactively."
(if (numberp current-prefix-arg)
current-prefix-arg
0) 1)
register (or evil-this-register (read-char)))
register (or evil-this-register (read-char nil t)))
(cond
((or (and (eq register ?@) (eq evil-last-register ?:))
(eq register ?:))
Expand Down Expand Up @@ -3408,7 +3408,7 @@ resp. after executing the command."
(match-beginning 0)
(match-end 0))
(catch 'exit-read-char
(while (setq response (read-char prompt))
(while (setq response (read-char prompt t))
(when (member response '(?y ?a ?l))
(unless count-only
(evil-replace-match evil-ex-substitute-replacement
Expand Down
2 changes: 1 addition & 1 deletion evil-common.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1900,7 +1900,7 @@ with regard to indentation."
POS defaults to the current position of point.
If ADVANCE is t, the marker advances when inserting text at it;
otherwise, it stays behind."
(interactive (list (read-char)))
(interactive (list (read-char nil t)))
(catch 'done
(let ((marker (evil-get-marker char t)) alist)
(unless (markerp marker)
Expand Down
2 changes: 1 addition & 1 deletion evil-types.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ the last column is excluded."

(evil-define-interactive-code "c"
"Read character."
(list (read-char)))
(list (read-char nil t)))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that this cannot be changed as it emulates the standard interactive code 'c' which does not set the inherit-input-method argument, but otherwise I do not see why not to merge this.


(evil-define-interactive-code "p"
"Prefix argument converted to number."
Expand Down