diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-04-09 15:11:38 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-04-09 15:11:38 -0400 |
| commit | 8a5ecdaa2faa550b4f3553beeda91c3c99c9bc05 (patch) | |
| tree | 60dfb6602a62af49b96feac8c5f82fffa87efd66 | |
| parent | 4b39b741f1949ebad1dfccc5032dfce521bedc2a (diff) | |
| download | emacs-8a5ecdaa2faa550b4f3553beeda91c3c99c9bc05.tar.gz | |
quail.el: Use delete-and-extract-region
* lisp/international/quail.el (quail-overlay-region-events):
Use delete-and-extract-region.
(quail-activate): Use setq-local.
| -rw-r--r-- | lisp/international/quail.el | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/lisp/international/quail.el b/lisp/international/quail.el index bd05fcec698..3266b93b446 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -568,7 +568,7 @@ While this input method is active, the variable (quail-delete-overlays) (setq describe-current-input-method-function nil) (quail-hide-guidance) - (remove-hook 'post-command-hook 'quail-show-guidance t) + (remove-hook 'post-command-hook #'quail-show-guidance t) (run-hooks 'quail-deactivate-hook)) (kill-local-variable 'input-method-function)) ;; Let's activate Quail input method. @@ -579,19 +579,18 @@ While this input method is active, the variable (setq name (car (car quail-package-alist))) (error "No Quail package loaded")) (quail-select-package name))) - (setq deactivate-current-input-method-function 'quail-deactivate) - (setq describe-current-input-method-function 'quail-help) + (setq deactivate-current-input-method-function #'quail-deactivate) + (setq describe-current-input-method-function #'quail-help) (quail-delete-overlays) (setq quail-guidance-str "") (quail-show-guidance) ;; If we are in minibuffer, turn off the current input method ;; before exiting. (when (eq (selected-window) (minibuffer-window)) - (add-hook 'minibuffer-exit-hook 'quail-exit-from-minibuffer) - (add-hook 'post-command-hook 'quail-show-guidance nil t)) + (add-hook 'minibuffer-exit-hook #'quail-exit-from-minibuffer) + (add-hook 'post-command-hook #'quail-show-guidance nil t)) (run-hooks 'quail-activate-hook) - (make-local-variable 'input-method-function) - (setq input-method-function 'quail-input-method))) + (setq-local input-method-function #'quail-input-method))) (define-obsolete-variable-alias 'quail-inactivate-hook @@ -1367,9 +1366,7 @@ If STR has `advice' text property, append the following special event: (let ((start (overlay-start overlay)) (end (overlay-end overlay))) (if (< start end) - (prog1 - (string-to-list (buffer-substring start end)) - (delete-region start end))))) + (string-to-list (delete-and-extract-region start end))))) (defsubst quail-delete-region () "Delete the text in the current translation region of Quail." |