unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: tumashu <tumashu@163.com>
To: "emacs-devel@gnu.org" <emacs-devel@gnu.org>
Subject: [patch] * lisp/international/mule-cmds.el (deactivate-input-method): Tiny improve.
Date: Wed, 28 Apr 2021 15:24:40 +0800 (CST)	[thread overview]
Message-ID: <72dd9740.3f2c.179175d9a8d.Coremail.tumashu@163.com> (raw)


[-- Attachment #1.1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #1.2: Type: text/html, Size: 111 bytes --]

[-- Attachment #2: 0001-lisp-international-mule-cmds.el-deactivate-input-met.patch --]
[-- Type: application/octet-stream, Size: 947 bytes --]

From cff0095c29f013304f345e58a0513b20a479d101 Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu@163.com>
Date: Wed, 28 Apr 2021 15:21:55 +0800
Subject: [PATCH] * lisp/international/mule-cmds.el (deactivate-input-method):
 Tiny improve.

---
 lisp/international/mule-cmds.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index b99db46e45..3deb448632 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1500,7 +1500,8 @@ deactivate-input-method
 	(progn
 	  (setq input-method-function nil
 		current-input-method-title nil)
-	  (funcall deactivate-current-input-method-function))
+          (when (functionp deactivate-current-input-method-function)
+	    (funcall deactivate-current-input-method-function)))
       (unwind-protect
 	  (run-hooks 'input-method-deactivate-hook)
 	(setq current-input-method nil)
-- 
2.20.1


             reply	other threads:[~2021-04-28  7:24 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-28  7:24 tumashu [this message]
2021-04-28 11:54 ` [patch] * lisp/international/mule-cmds.el (deactivate-input-method): Tiny improve Eli Zaretskii
2021-04-28 12:33   ` tumashu
2021-04-28 15:03     ` Eli Zaretskii
2021-04-28 22:37       ` tumashu
2021-05-08  9:54         ` tumashu
2021-05-08 14:02           ` Eli Zaretskii

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=72dd9740.3f2c.179175d9a8d.Coremail.tumashu@163.com \
    --to=tumashu@163.com \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).