comparison lisp/international/quail.el @ 102030:1e6acde5f33a

(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.

102029:3223937a77f8

  "Convert input string STR to a list of events.
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))
		 str)))
    (if (or (get-text-property 0 'advice str)
	    (next-single-property-change 0 'advice str))
	(setq events
	      (nconc events (list (list 'quail-advice str)))))

	    (or (member key elt)
		(aset table char (cons key elt)))
	  (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)))))

;; Helper function for quail-gen-decode-map.  Store key strings to
;; type each character under MAP in TABLE (char-table).  MAP is an
;; element of the current Quail map reached by typing keys in KEY
;; (string).

;; Check if CHAR equals to TARGET while also trying to translate CHAR
;; by translation-table-for-input.

(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))))

;; Helper function for quail-find-key.  Prepend key strings to type
;; for inputting CHAR by the current input method to KEY-LIST and
;; return the result.  MAP is an element of the current Quail map
;; reached by typing keys in KEY.

102030:1e6acde5f33a

  "Convert input string STR to a list of events.
If STR has `advice' text property, append the following special event:
\(quail-advice STR)"
  (let ((events (mapcar
		 (lambda (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))
	(setq events
	      (nconc events (list (list 'quail-advice str)))))

	    (or (member key elt)
		(aset table char (cons key elt)))
	  (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))))))

;; Helper function for quail-gen-decode-map.  Store key strings to
;; type each character under MAP in TABLE (char-table).  MAP is an
;; element of the current Quail map reached by typing keys in KEY
;; (string).

;; Check if CHAR equals to TARGET while also trying to translate CHAR
;; by translation-table-for-input.

(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)))))

;; Helper function for quail-find-key.  Prepend key strings to type
;; for inputting CHAR by the current input method to KEY-LIST and
;; return the result.  MAP is an element of the current Quail map
;; reached by typing keys in KEY.