(quail-input-string-to-events, quail-store-decode-map-key, quail-char-equal-p):

Use `with-no-warnings' around forms that refer to translation-table-for-input.

1 files changed, 17 insertions, 12 deletions

diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 67c3cfb4815..63b00878f16 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -1290,11 +1290,12 @@ If STR has `advice' text property, append the following special event:
 \(quail-advice STR)"
   (let ((events (mapcar
                  (lambda (c)
-                   ;; This gives us the chance to unify on input
-                   ;; (e.g. using ucs-tables.el).
-                   (or (and translation-table-for-input
-                            (aref translation-table-for-input c))
-                       c))
+                   (or
+                    ;; Avoid "obsolete" warnings for translation-table-for-input.
+                    (with-no-warnings
+                      (and translation-table-for-input
+                           (aref translation-table-for-input c)))
+                    c))
                  str)))
     (if (or (get-text-property 0 'advice str)
             (next-single-property-change 0 'advice str))
@@ -2645,10 +2646,12 @@ KEY BINDINGS FOR CONVERSION
           (or (string= key elt)
               (aset table char (list key elt))))
       (aset table char key))
-    (if (and translation-table-for-input
-             (setq char (aref translation-table-for-input char)))
-        (let ((translation-table-for-input nil))
-          (quail-store-decode-map-key table char key)))))
+    ;; Avoid "obsolete" warnings for translation-table-for-input.
+    (with-no-warnings
+      (if (and translation-table-for-input
+               (setq char (aref translation-table-for-input char)))
+          (let ((translation-table-for-input nil))
+            (quail-store-decode-map-key table char key))))))
 
 ;; Helper function for quail-gen-decode-map.  Store key strings to
 ;; type each character under MAP in TABLE (char-table).  MAP is an
@@ -2697,9 +2700,11 @@ KEY BINDINGS FOR CONVERSION
 
 (defsubst quail-char-equal-p (char target)
   (or (= char target)
-      (and translation-table-for-input
-           (setq char (aref translation-table-for-input char))
-           (= char target))))
+      ;; Avoid "obsolete" warnings for translation-table-for-input.
+      (with-no-warnings
+        (and translation-table-for-input
+             (setq char (aref translation-table-for-input char))
+             (= char target)))))
 
 ;; Helper function for quail-find-key.  Prepend key strings to type
 ;; for inputting CHAR by the current input method to KEY-LIST and