Fix last font-related change.

[gnu-emacs] / leim / quail / ipa.el

diff --git a/leim/quail/ipa.el b/leim/quail/ipa.el
index 559841e890501a5468a82c7578173b5c8a1b131c..8b921faa1e26873ad414f114ccbc4ac450784ca0 100644 (file)
--- a/leim/quail/ipa.el
+++ b/leim/quail/ipa.el
@@ -1,11 +1,11 @@
 ;;; ipa.el --- Quail package for inputting IPA characters  -*-coding: utf-8;-*-
 
+;; Copyright (C) 2009-2013 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 ;; Licensed to the Free Software Foundation.
-;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
 ;; Keywords: multilingual, input method, IPA
 
@@ -29,7 +29,7 @@
 ;;; Code:
 
 (require 'quail)
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
 
 (quail-define-package
  "ipa" "IPA" "IPA" t
@@ -183,7 +183,7 @@ incorrectly, as separate from the modified glyphs.")
         "˚"]) ;; +Unexploded modifier                 U+02DA
  ("<r>" "ʳ")  ;; +Rhotacized modifier                 U+02B3
  ("<w>" "ʷ")  ;; +Labialized modifier                 U+02B7
- ("<?>" "ʱ")  ;; +Murmured modififer                  U+02B1
+ ("<?>" "ʱ")  ;; +Murmured modifier                   U+02B1
 
  ("b<trl>" "ʙ")       ;; Bilabial trill                       U+0299
  ("b`" "ɓ")   ;; Bilabial implosive                   U+0253
@@ -277,13 +277,13 @@ string."
       (setq quail-keymap (list (string quail-keymap)))
     (if (stringp quail-keymap)
        (setq quail-keymap (list quail-keymap))
-      (assert (vectorp quail-keymap) t)
+      (cl-assert (vectorp quail-keymap) t)
       (setq quail-keymap (append quail-keymap nil))))
   (list
    (apply 'vector
          (mapcar
           #'(lambda (entry)
-               (assert (char-or-string-p entry) t)
+               (cl-assert (char-or-string-p entry) t)
                (format "%s%s" to-prepend
                        (if (integerp entry) (string entry) entry)))
           quail-keymap))))
@@ -318,18 +318,18 @@ particular sequence of keys, and the result will be cached by Quail."
     (dolist (underscoring underscore-map)
       (cond ((null underscoring))
            ((eq (length underscoring) 2)
-            (setq underscore-map-entry (second underscoring))
+            (setq underscore-map-entry (cl-second underscoring))
             (setcdr underscoring (ipa-x-sampa-prepend-to-keymap-entry
                                   pre-underscore-map underscore-map-entry)))
            ((eq (length underscoring) 3)
-            (setq underscore-map-entry (second (third underscoring)))
-            (setcdr (third underscoring)
+            (setq underscore-map-entry (cl-second (cl-third underscoring)))
+            (setcdr (cl-third underscoring)
                     (ipa-x-sampa-prepend-to-keymap-entry
                      pre-underscore-map underscore-map-entry)))
            (t
-            (assert (null t) t
-                    "Can't handle subtrees of this level right now."))))
-    (append underscore-map (list (list ?< (second x-sampa-submap-entry))))))
+            (cl-assert (null t) t
+                        "Can't handle subtrees of this level right now."))))
+    (append underscore-map (list (list ?< (cl-second x-sampa-submap-entry))))))
 
 (quail-define-package
  "ipa-x-sampa" "IPA" "IPA-X" t
@@ -341,7 +341,7 @@ uses this transliteration to allow you to produce the IPA in your editor
 with a keyboard that's limited to ASCII.
 
 See http://www.phon.ucl.ac.uk/home/sampa/ipasam-x.pdf for a full definition
-of the mapping. A caveat with regard to that document; while XEmacs
+of the mapping.  A caveat with regard to that document; while XEmacs
 currently preserves Unicode diacritics on reading and emitting them, it
 displays them, incorrectly, as separate from the modified glyphs.")
 
@@ -465,8 +465,8 @@ displays them, incorrectly, as separate from the modified glyphs.")
  ("_}" "̚")   ;; No audible release                   U+031A
  ;; ` is alternatively; retroflexion in consonants
  ("`" "˞")    ;; Rhotacization in vowels              U+02DE
- ("_~" "̃")   ;; Nasalisation                         U+0303
- ("~" "̃")    ;; Nasalisation                         U+0303
+ ("_~" "̃")   ;; Nasalization                         U+0303
+ ("~" "̃")    ;; Nasalization                         U+0303
  ("_A" "̘")   ;; Advanced tongue root                 U+0318
  ("_a" "̺")   ;; Apical                               U+033A
  ("_B" "̏")   ;; Extra low tone                       U+030F