(quail-lookup-key): If cdr of MAP is a

function, replace cdr of MAP by the return value of the function
unconditionally.

diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 83c24084b20186dbe0b1f3e9dc3a23fe5884d518..d873907e3a276089cab8f20c61529d129fb864dd 100644 (file)
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -856,12 +856,10 @@ The returned value is a Quail map specific to KEY."
              (progn
                (setq quail-current-translations translation)
                (if (quail-forget-last-selection)
-                   (setcar (car quail-current-translations) 0))))
-         ;; We may have to reform cdr part of MAP.
-         (if (and (cdr map) (symbolp (cdr map)))
-             (progn
-               (setcdr map (funcall (cdr map) key len))))
-         ))
+                   (setcar (car quail-current-translations) 0))))))
+    ;; We may have to reform cdr part of MAP.
+    (if (and (cdr map) (functionp (cdr map)))
+       (setcdr map (funcall (cdr map) key len)))
     map))
 
 (put 'quail-error 'error-conditions '(quail-error error))