[Emacs-diffs] emacs/lisp/international quail.el

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    09/02/14 09:05:59

Modified files:
        lisp/international: quail.el 

Log message:
        (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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/international/quail.el?cvsroot=emacs&r1=1.171&r2=1.172

Patches:
Index: quail.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/international/quail.el,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -b -r1.171 -r1.172
--- quail.el    12 Feb 2009 18:13:22 -0000      1.171
+++ quail.el    14 Feb 2009 09:05:59 -0000      1.172
@@ -1290,10 +1290,11 @@
 \(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))
+                  (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)
@@ -2645,10 +2646,12 @@
          (or (string= key elt)
              (aset table char (list key elt))))
       (aset 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)))))
+           (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 @@
 
 (defsubst quail-char-equal-p (char target)
   (or (= 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))))
+            (= 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