From c68bd0747d60c4e7c3fd146d34758b2edc56e59d Mon Sep 17 00:00:00 2001 From: William G Hatch Date: Wed, 21 Jun 2017 15:25:35 -0600 Subject: [PATCH] use the `inherit-input-method` argument of read-char --- evil-commands.el | 10 +++++----- evil-common.el | 2 +- evil-types.el | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/evil-commands.el b/evil-commands.el index dbbd0dd0..dfdd6343 100644 --- a/evil-commands.el +++ b/evil-commands.el @@ -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) @@ -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)) @@ -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 @@ -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 ?:)) @@ -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 diff --git a/evil-common.el b/evil-common.el index 501b9e7a..18180744 100644 --- a/evil-common.el +++ b/evil-common.el @@ -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) diff --git a/evil-types.el b/evil-types.el index 89ca59a1..b8b1c102 100644 --- a/evil-types.el +++ b/evil-types.el @@ -244,7 +244,7 @@ the last column is excluded." (evil-define-interactive-code "c" "Read character." - (list (read-char))) + (list (read-char nil t))) (evil-define-interactive-code "p" "Prefix argument converted to number."