From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#44266: Transient input methods Date: Thu, 05 Nov 2020 22:14:24 +0200 Organization: LINKOV.NET Message-ID: <87k0uzy31b.fsf@mail.linkov.net> References: <87o8knao7u.fsf_-_@mail.linkov.net> <87pn4wvjy1.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36327"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (x86_64-pc-linux-gnu) To: 44266@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Nov 05 21:24:16 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kalnr-0009L9-Ss for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 05 Nov 2020 21:24:15 +0100 Original-Received: from localhost ([::1]:39392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kalnq-0005SC-V2 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 05 Nov 2020 15:24:14 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kalne-0005Rl-KF for bug-gnu-emacs@gnu.org; Thu, 05 Nov 2020 15:24:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:42709) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kalne-0006gZ-Ba for bug-gnu-emacs@gnu.org; Thu, 05 Nov 2020 15:24:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kalne-0005O4-8b for bug-gnu-emacs@gnu.org; Thu, 05 Nov 2020 15:24:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 05 Nov 2020 20:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44266 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 44266-submit@debbugs.gnu.org id=B44266.160460779020630 (code B ref 44266); Thu, 05 Nov 2020 20:24:02 +0000 Original-Received: (at 44266) by debbugs.gnu.org; 5 Nov 2020 20:23:10 +0000 Original-Received: from localhost ([127.0.0.1]:54251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kalmn-0005Mf-CB for submit@debbugs.gnu.org; Thu, 05 Nov 2020 15:23:09 -0500 Original-Received: from relay1-d.mail.gandi.net ([217.70.183.193]:57155) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kalml-0005Ly-FZ for 44266@debbugs.gnu.org; Thu, 05 Nov 2020 15:23:08 -0500 X-Originating-IP: 91.129.97.46 Original-Received: from mail.gandi.net (m91-129-97-46.cust.tele2.ee [91.129.97.46]) (Authenticated sender: juri@linkov.net) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 850D8240008 for <44266@debbugs.gnu.org>; Thu, 5 Nov 2020 20:23:00 +0000 (UTC) In-Reply-To: <87pn4wvjy1.fsf@mail.linkov.net> (Juri Linkov's message of "Sun, 01 Nov 2020 23:36:06 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:192752 Archived-At: --=-=-= Content-Type: text/plain Here is a patch that implements support for transient input methods in Isearch mode. While 'C-x 8' simply adds own keys to the default isearch-mode-map, input methods have to rely on isearch-process-search-multibyte-characters in lisp/international/isearch-x.el. Since it uses 'read-string' to read a character, currently the activated transient input method is deactivated in the minibuffer of 'read-string' that is a wrong place, so needed to introduce a new separate function deactivate-transient-input-method, thus renamed the previous function to activate-transient-input-method, and had to add more global variables. But in result everything works fine: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=isearch-transient-input-method.patch diff --git a/lisp/isearch.el b/lisp/isearch.el index 245bf452b1..4fba4370d9 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -565,6 +565,10 @@ isearch-menu-bar-map :help "Highlight all matches for current search string")) (define-key map [isearch-search-replace-separator] '(menu-item "--")) + (define-key map [isearch-transient-input-method] + '(menu-item "Turn on transient input method" + isearch-transient-input-method + :help "Turn on transient input method for search")) (define-key map [isearch-toggle-specified-input-method] '(menu-item "Turn on specific input method" isearch-toggle-specified-input-method @@ -747,6 +751,7 @@ isearch-mode-map ;; For searching multilingual text. (define-key map "\C-\\" 'isearch-toggle-input-method) (define-key map "\C-^" 'isearch-toggle-specified-input-method) + (define-key map "\C-x\\" 'isearch-transient-input-method) ;; People expect to be able to paste with the mouse. (define-key map [mouse-2] #'isearch-mouse-2) @@ -1078,6 +1083,8 @@ isearch-forward \\[isearch-toggle-specified-input-method], and specify an input method you want to use. +To activate a transient input method, type \\[isearch-transient-input-method]. + The above keys, bound in `isearch-mode-map', are often controlled by options; do \\[apropos] on search-.* to find them. Other control and meta characters terminate the search diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el index d77234ec77..b22d0e968d 100644 --- a/lisp/international/isearch-x.el +++ b/lisp/international/isearch-x.el @@ -51,6 +51,18 @@ isearch-toggle-input-method (setq input-method-function nil) (isearch-update)) +;;;###autoload +(defun isearch-transient-input-method () + "Activate transient input method in interactive search." + (interactive) + (when default-transient-input-method + (let ((overriding-terminal-local-map nil)) + (activate-transient-input-method)) + (setq isearch-input-method-function input-method-function + isearch-input-method-local-p t) + (setq input-method-function nil) + (isearch-update))) + (defvar isearch-minibuffer-local-map (let ((map (copy-keymap minibuffer-local-map))) (define-key map [with-keyboard-coding] 'isearch-with-keyboard-coding) @@ -117,6 +129,7 @@ isearch-process-search-multibyte-characters (cons last-char unread-command-events)) ;; Inherit current-input-method in a minibuffer. str (read-string prompt isearch-message 'junk-hist nil t)) + (deactivate-transient-input-method) (if (or (not str) (< (length str) (length isearch-message))) ;; All inputs were deleted while the input method ;; was working. diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index dc435d9b17..7eab01d804 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -55,7 +55,7 @@ mule-keymap ;; Keep "C-x C-m ..." for mule specific commands. (define-key ctl-x-map "\C-m" mule-keymap) -(define-key ctl-x-map "\\" 'transient-input-method) +(define-key ctl-x-map "\\" 'activate-transient-input-method) (defvar describe-language-environment-map (let ((map (make-sparse-keymap "Describe Language Environment"))) @@ -1345,10 +1345,10 @@ default-input-method mule-input-method-string) :set-after '(current-language-environment)) -(defcustom transient-input-method nil +(defcustom default-transient-input-method nil "Default transient input method. This is the input method activated by the command -`transient-input-method' (\\[transient-input-method])." +`activate-transient-input-method' (\\[activate-transient-input-method])." :link '(custom-manual "(emacs)Input Methods") :group 'mule :type '(choice (const nil) @@ -1356,6 +1356,18 @@ transient-input-method :set-after '(current-language-environment) :version "28.1") +(defvar current-transient-input-method nil + "The current input method temporarily enabled by `activate-transient-input-method'. +If nil, that means no transient input method is activated now.") +(make-variable-buffer-local 'current-transient-input-method) +(put 'current-transient-input-method 'permanent-local t) + +(defvar previous-transient-input-method nil + "The input method that was active before enabling the transient input method. +If nil, that means no previous input method was active.") +(make-variable-buffer-local 'previous-transient-input-method) +(put 'previous-transient-input-method 'permanent-local t) + (put 'input-method-function 'permanent-local t) (defvar input-method-history nil @@ -1531,36 +1543,43 @@ set-input-method (defvar toggle-input-method-active nil "Non-nil inside `toggle-input-method'.") -(defun transient-input-method (&optional arg interactive) +(defun activate-transient-input-method (&optional arg interactive) "Enable a transient input method for the current buffer. -If `transient-input-method' was not yet defined, prompt for it." +If `default-transient-input-method' was not yet defined, prompt for it." (interactive "P\np") - (when (or arg (not transient-input-method)) + (when (or arg (not default-transient-input-method)) (let* ((default (or (car input-method-history) default-input-method)) (input-method (read-input-method-name (if default "Transient input method (default %s): " "Transient input method: ") default t))) - (setq transient-input-method input-method) + (setq default-transient-input-method input-method) (when interactive - (customize-mark-as-set 'transient-input-method)))) - (let* ((previous-input-method current-input-method) - (history input-method-history) - (clearfun (make-symbol "clear-transient-input-method")) + (customize-mark-as-set 'default-transient-input-method)))) + (let* ((clearfun (make-symbol "clear-transient-input-method")) (exitfun (lambda () - (deactivate-input-method) - (when previous-input-method - (activate-input-method previous-input-method)) - (setq input-method-history history) + (deactivate-transient-input-method) (remove-hook 'input-method-after-insert-chunk-hook clearfun)))) (fset clearfun (lambda () (funcall exitfun))) (add-hook 'input-method-after-insert-chunk-hook clearfun) - (when previous-input-method - (deactivate-input-method)) - (activate-input-method transient-input-method) + (let ((input-method-history input-method-history)) + (setq previous-transient-input-method current-input-method) + (when previous-transient-input-method + (deactivate-input-method)) + (activate-input-method default-transient-input-method) + (setq current-transient-input-method default-transient-input-method)) exitfun)) +(defun deactivate-transient-input-method () + (when current-transient-input-method + (let ((input-method-history input-method-history)) + (deactivate-input-method) + (when previous-transient-input-method + (activate-input-method previous-transient-input-method) + (setq previous-transient-input-method nil)) + (setq current-transient-input-method nil)))) + (defun toggle-input-method (&optional arg interactive) "Enable or disable multilingual text input method for the current buffer. Only one input method can be enabled at any time in a given buffer. --=-=-=--