diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/leim/quail/uni-input.el | |
parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/leim/quail/uni-input.el')
-rw-r--r-- | lisp/leim/quail/uni-input.el | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lisp/leim/quail/uni-input.el b/lisp/leim/quail/uni-input.el index c7cf6abe2aa..bfe4ce6f120 100644 --- a/lisp/leim/quail/uni-input.el +++ b/lisp/leim/quail/uni-input.el @@ -1,4 +1,4 @@ -;;; uni-input.el --- Hex Unicode input method +;;; uni-input.el --- Hex Unicode input method -*- lexical-binding: t; -*- ;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 @@ -57,11 +57,12 @@ (echo-keystrokes 0) (help-char nil) (events (list key)) - (str " ")) + ;; (str " ") + ) (unwind-protect (catch 'non-digit (progn - (dotimes (i 4) + (dotimes (_ 4) (let ((seq (read-key-sequence nil)) key) (if (and (stringp seq) @@ -76,7 +77,7 @@ (throw 'non-digit (append (reverse events) (listify-key-sequence seq)))))) (quail-delete-region) - (let ((n (string-to-number (apply 'string + (let ((n (string-to-number (apply #'string (cdr (nreverse events))) 16))) (if (characterp n) @@ -100,12 +101,12 @@ While this input method is active, the variable (quail-delete-overlays) (setq describe-current-input-method-function nil)) (kill-local-variable 'input-method-function)) - (setq deactivate-current-input-method-function 'ucs-input-deactivate) - (setq describe-current-input-method-function 'ucs-input-help) + (setq deactivate-current-input-method-function #'ucs-input-deactivate) + (setq describe-current-input-method-function #'ucs-input-help) (quail-delete-overlays) (if (eq (selected-window) (minibuffer-window)) - (add-hook 'minibuffer-exit-hook 'quail-exit-from-minibuffer)) - (setq-local input-method-function 'ucs-input-method))) + (add-hook 'minibuffer-exit-hook #'quail-exit-from-minibuffer)) + (setq-local input-method-function #'ucs-input-method))) (defun ucs-input-deactivate () "Deactivate UCS input method." @@ -114,7 +115,7 @@ While this input method is active, the variable (define-obsolete-function-alias 'ucs-input-inactivate - 'ucs-input-deactivate "24.3") + #'ucs-input-deactivate "24.3") (defun ucs-input-help () (interactive) |