From: John Paul Wallington <jpw@pobox.com>
Date: Tue, 20 Apr 2004 00:26:36 +0000 (+0000)
Subject: (regularize_fontname): Renamed from regulalize_fontname.
X-Git-Tag: ttn-vms-21-2-B4~6725
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4ce2719dbb375450ba88d8aab4b4bb904d5af530;p=emacs.git

(regularize_fontname): Renamed from regulalize_fontname.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index f8d2ee0200c..487fa45e14e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-20  John Paul Wallington  <jpw@gnu.org>
+
+	* fns.c (Fassoc, Feql): Fix indentation.
+
+	* fontset.c (regularize_fontname): Renamed from	regulalize_fontname.
+
 2004-04-19  John Paul Wallington  <jpw@gnu.org>
 
 	* fns.c (Feql): New function.
diff --git a/src/fontset.c b/src/fontset.c
index 6ed1efff092..1a7fdb29041 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -194,7 +194,7 @@ static Lisp_Object make_fontset P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
 static int fontset_id_valid_p P_ ((int));
 static Lisp_Object fontset_pattern_regexp P_ ((Lisp_Object));
 static Lisp_Object font_family_registry P_ ((Lisp_Object, int));
-static Lisp_Object regulalize_fontname P_ ((Lisp_Object));
+static Lisp_Object regularize_fontname P_ ((Lisp_Object));
 
 
 /********** MACROS AND FUNCTIONS TO HANDLE FONTSET **********/
@@ -1042,7 +1042,7 @@ check_fontset_name (name)
    string, maybe change FONTNAME to (FAMILY . REGISTRY).  */
 
 static Lisp_Object
-regulalize_fontname (Lisp_Object fontname)
+regularize_fontname (Lisp_Object fontname)
 {
   Lisp_Object family, registry;
 
@@ -1133,7 +1133,7 @@ name of a font, REGISTRY is a registry name of a font.  */)
   if (!NILP (frame))
     CHECK_LIVE_FRAME (frame);
 
-  elt = Fcons (make_number (from), regulalize_fontname (fontname));
+  elt = Fcons (make_number (from), regularize_fontname (fontname));
   for (; from <= to; from++)
     FONTSET_SET (fontset, from, elt);
   Foptimize_char_table (fontset);
@@ -1540,7 +1540,7 @@ It is intended that this function is called only from
 
       elt = XCAR (tail);
       target = Fcar (elt);
-      elt = Fcons (Qnil, regulalize_fontname (Fcdr (elt)));
+      elt = Fcons (Qnil, regularize_fontname (Fcdr (elt)));
       if (! CHAR_TABLE_P (target))
 	{
 	  int charset, c;