Mercurial > emacs
changeset 79505:42b98dfc31f6
(toggle-input-method-active): New var.
(toggle-input-method): Bind toggle-input-method-active to t.
Error if it was already non-nil.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Thu, 29 Nov 2007 22:34:21 +0000 |
| parents | 356a01f90f6d |
| children | b2ecd4774c57 |
| files | lisp/international/mule-cmds.el |
| diffstat | 1 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/international/mule-cmds.el Thu Nov 29 07:28:18 2007 +0000 +++ b/lisp/international/mule-cmds.el Thu Nov 29 22:34:21 2007 +0000 @@ -1492,6 +1492,9 @@ (customize-mark-as-set 'default-input-method)) default-input-method) +(defvar toggle-input-method-active nil + "Non-nil inside `toggle-input-method'.") + (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. @@ -1511,9 +1514,12 @@ which marks the variable `default-input-method' as set for Custom buffers." (interactive "P\np") + (if toggle-input-method-active + (error "Recursive use of `toggle-input-method'")) (if (and current-input-method (not arg)) (inactivate-input-method) - (let ((default (or (car input-method-history) default-input-method))) + (let ((toggle-input-method-active t) + (default (or (car input-method-history) default-input-method))) (if (and arg default (equal current-input-method default) (> (length input-method-history) 1)) (setq default (nth 1 input-method-history)))