Mercurial > emacs

changeset 102030:1e6acde5f33a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 14 Feb 2009 09:05:59 +0000
parents 3223937a77f8
children 7a9e5d67e102
files lisp/international/quail.el
diffstat 1 files changed, 17 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/international/quail.el	Sat Feb 14 09:04:46 2009 +0000
+++ b/lisp/international/quail.el	Sat Feb 14 09:05:59 2009 +0000
@@ -1290,11 +1290,12 @@
 \(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 @@
 	  (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 @@
 
 (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