diff options
| author | Miles Bader <miles@gnu.org> | 2004-09-21 09:34:12 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-09-21 09:34:12 +0000 |
| commit | 70db5adc8cbff02a4d142bd077c336f22f859dd4 (patch) | |
| tree | 558869c585116bfa9fd7456ef0d11aec592f4a7e /lisp/descr-text.el | |
| parent | 736b5ed5851ae6824fbd3bee3cbc4af13464f897 (diff) | |
| parent | 3234a6e6aad9371426bce9ae97b4cacbda16e22d (diff) | |
| download | emacs-70db5adc8cbff02a4d142bd077c336f22f859dd4.tar.gz | |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-43
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-553
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-557
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-558
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-559
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-561
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-30
Update from CVS
Diffstat (limited to 'lisp/descr-text.el')
| -rw-r--r-- | lisp/descr-text.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/descr-text.el b/lisp/descr-text.el index 108d7d87a1e..8f915d52d3a 100644 --- a/lisp/descr-text.el +++ b/lisp/descr-text.el @@ -517,7 +517,8 @@ as well as widgets, buttons, overlays, and text properties." (push (format "%s;" (pop props)) ps)) (list (cons "Properties" (nreverse ps))))) ("to input" - ,@(let ((key-list (and current-input-method + ,@(let ((key-list (and (eq input-method-function + 'quail-input-method) (quail-find-key char)))) (if (consp key-list) (list "type" |