Fix typos.

12 files changed, 54 insertions, 50 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 94a02e6e9ba..d0d3363d522 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * nsfont.m (syms_of_nsfont) <ns-reg-to-script>: Fix typo.
+
 2011-11-20  Martin Rudalics  <rudalics@gmx.at>
 
         * window.c (Fset_window_combination_limit): Rename argument
diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index efe77648458..7fef45f36da 100644
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -2237,7 +2237,7 @@
 
         * data.c (Fset):
         If Vautoload_queue non-nil, record function and old definition
-        by consing onto Vautoload_qeueue.
+        by consing onto Vautoload_queue.
 
         * fns.c (Fprovide):
         If Vautoload_queue is non-nil, record old value of Vfeatures.
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 1992ef96e0a..99ab02577d5 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -18755,7 +18755,7 @@
 
 2003-05-21  Dave Love  <fx@gnu.org>
 
-        [Merged from unicode branch.]
+        [Merged from Unicode branch.]
 
         * xfns.c (x_window, x_window): Use use_xim.
 
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 896f08916b3..07d4f4ec116 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -4839,7 +4839,7 @@
 
 2010-08-13  Jason Rumney  <jasonr@gnu.org>
 
-        * w32menu.c (simple_dialog_show): Use unicode message box if available.
+        * w32menu.c (simple_dialog_show): Use Unicode message box if available.
         (MessageBoxW_Proc): New function typedef.
         (unicode-message-box): New function pointer.
         (globals_of_w32menu): Import it from user32.dll.  (Bug#5629)
@@ -8991,8 +8991,8 @@
 2010-04-13  Jan Djärv  <jan.h.d@swipnet.se>
 
         * gtkutil.c (xg_set_geometry): Set geometry for PPosition also.
-        (x_wm_set_size_hint): Dont set position flags, gtk_window_parse_geometry
-        does that.
+        (x_wm_set_size_hint): Don't set position flags,
+        gtk_window_parse_geometry does that.
 
         * xfns.c (Fx_create_frame, x_create_tip_frame): Set default border width
         to zero.
@@ -9864,8 +9864,8 @@
 
 2010-01-27  Jason Rumney  <jasonr@gnu.org>
 
-        * w32inevt.c (w32_kbd_patch_key): Save the unicode character.
-        (key_event): Use unicode for characters 128 and higher (Bug#4567).
+        * w32inevt.c (w32_kbd_patch_key): Save the Unicode character.
+        (key_event): Use Unicode for characters 128 and higher (Bug#4567).
 
 2010-01-27  Kenichi Handa  <handa@m17n.org>
 
@@ -11541,7 +11541,7 @@
         (syms_of_nsfont): Declare it.
         (ns_registry_to_script): New function.
         (ns_get_req_script): Call it.
-        (ns_findfonts): Don't give up on non-unicode registry.
+        (ns_findfonts): Don't give up on non-Unicode registry.
 
         * font.c (DEFAULT_ENCODING) [HAVE_NS]: Remove special case.
 
@@ -17147,10 +17147,10 @@
 
 2008-07-30  Jason Rumney  <jasonr@gnu.org>
 
-        * w32font.h (struct w32font_info): Use unicode version of textmetrics.
+        * w32font.h (struct w32font_info): Use Unicode version of textmetrics.
 
-        * w32font.c (w32font_encode_char): Leave as unicode if in range.
-        (w32font_open_internal): Get unicode version of textmetrics.
+        * w32font.c (w32font_encode_char): Leave as Unicode if in range.
+        (w32font_open_internal): Get Unicode version of textmetrics.
         Don't enable or disable glyph indices here.
         (w32font_open): Disable use of glyph indices.
 
@@ -19178,7 +19178,7 @@
 2008-06-10  Jason Rumney  <jasonr@gnu.org>
 
         * w32uniscribe.c (add_opentype_font_name_to_list):
-        Skip non unicode fonts.
+        Skip non Unicode fonts.
 
 2008-06-10  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -19647,7 +19647,7 @@
         `raster' specified.
         (add_font_entity_to_list): Allow non-opentype truetype fonts back
         in the uniscribe backend, but disallow any font that has no
-        unicode subrange support.
+        Unicode subrange support.
 
 2008-05-29  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -21813,8 +21813,8 @@
 2008-03-06  Jason Rumney  <jasonr@gnu.org>
 
         * w32font.c (w32_registry): Take font_type argument.  Use ANSI
-        when charset not specified.  Only translate ANSI to unicode when
-        font_type is truetype.
+        when charset not specified.  Only translate ANSI to Unicode when
+        font_type is TrueType.
         (w32font_coverage_ok): New function.
         (add_font_entity_to_list): Use it to filter unsuitable fonts.
 
@@ -23463,10 +23463,10 @@
         (w32font_list, w32font_match): Use it.
         (w32font_open): Don't populate subranges.
         (w32font_has_char): Use script Lisp symbols, not subrange bitmask.
-        (w32font_encode_char): Always return unicode code-point as-is.
+        (w32font_encode_char): Always return Unicode code-point as-is.
         (w32font_text_extents): Supply a transformation matrix to
         GetGlyphOutline.  Never look up by glyph index.  Avoid looping
-        twice.  Use unicode version of GetTexExtentPoint32 instead of
+        twice.  Use Unicode version of GetTexExtentPoint32 instead of
         glyph index version.
         (set_fonts_frame): Remove.
         (w32_enumfont_pattern_entity): Add frame parameter, use it to
@@ -25425,16 +25425,16 @@
         (pfnGetFontUnicodeRanges): New dynamically loaded function.
         (w32_initialize): Try to load it.
         (x_get_font_repertory): Use it if available.
-        (w32_encode_char): Add shortcut for unicode output.
+        (w32_encode_char): Add shortcut for Unicode output.
 
         * w32fns.c (w32_load_system_font): Default charset to -1.
-        (x_to_w32_charset): Match all fonts for unicode.
+        (x_to_w32_charset): Match all fonts for Unicode.
         (w32_to_x_charset): New parameter matching.  Don't return partial
         or wildcard charsets.
         (w32_to_all_x_charsets): Don't return partial or wildcard charsets.
-        (w32_codepage_for_font): Return CP_UNICODE for unicode.
+        (w32_codepage_for_font): Return CP_UNICODE for Unicode.
         (w32_to_x_font): Match charset to real charset.
-        (enum_font_cb2): Always list unicode versions.
+        (enum_font_cb2): Always list Unicode versions.
 
         * makefile.w32-in (temacs): Increase EMHEAP.
 
@@ -25458,7 +25458,7 @@
 
         * w32fns.c (Fx_create_frame, x_create_tip_frame): Use new version
         of x_new_fontset.
-        (w32_load_system_font): Initialize charset as unicode.
+        (w32_load_system_font): Initialize charset as Unicode.
         font_info.encoding becomes encoding_type.
         (w32_to_x_font): Use decode_coding_c_string in place of decode_coding.
         (x_to_w32_font): Use encode_coding_object in place of encode_coding.
@@ -27685,7 +27685,7 @@
         * xterm.c (handle_one_xevent): Revert to counting chars not bytes.
 
         * w32term.c (w32_read_socket) <WM_CHAR>: Decode characters outside
-        the unicode range available in MULE by locale-coding-system.
+        the Unicode range available in MULE by locale-coding-system.
         Improve dbcs lead byte detection.  Set event timestamp and modifiers
         earlier.
 
@@ -30873,7 +30873,7 @@
 2007-06-17  Jason Rumney  <jasonr@gnu.org>
 
         * w32menu.c (add_menu_item): Don't use multibyte string functions on
-        unicode strings.
+        Unicode strings.
 
 2007-06-16  Juanma Barranquero  <lekktu@gmail.com>
 
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index 9e7bd24f792..6f007992bef 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -5150,7 +5150,7 @@
 2000-11-27  Jason Rumney  <jasonr@gnu.org>
 
         * w32fns.c (w32_load_system_font): Always mark font as double byte
-        if codepage is unicode.
+        if codepage is Unicode.
 
 2000-11-27  Gerd Moellmann  <gerd@gnu.org>
 
diff --git a/src/keyboard.c b/src/keyboard.c
index 80873fcb57a..9b4ba427c24 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4813,7 +4813,7 @@ const char *const lispy_function_keys[] =
     "ico-00",        /* VK_ICO_00         0xE4 */
     0,               /* VK_PROCESSKEY     0xE5 - used by IME */
     "ico-clear",     /* VK_ICO_CLEAR      0xE6 */
-    0,               /* VK_PACKET         0xE7  - used to pass unicode chars */
+    0,               /* VK_PACKET         0xE7  - used to pass Unicode chars */
     0,               /*                   0xE8 */
     "reset",         /* VK_OEM_RESET      0xE9 */
     "jump",          /* VK_OEM_JUMP       0xEA */
diff --git a/src/nsfont.m b/src/nsfont.m
index c4d9123faef..7d691ced6e1 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -256,7 +256,7 @@ ns_char_width (NSFont *sfont, int c)
 
 
 /* Return whether set1 covers set2 to a reasonable extent given by pct.
-   We check, out of each 16 unicode char range containing chars in set2,
+   We check, out of each 16 Unicode char range containing chars in set2,
    whether at least one character is present in set1.
    This must be true for pct of the pairs to consider it covering. */
 static BOOL
@@ -297,7 +297,7 @@ static NSString
 
 
 /* Convert OTF 4-letter script code to emacs script name.  (Why can't
-   everyone just use some standard unicode names for these?) */
+   everyone just use some standard Unicode names for these?) */
 static NSString
 *ns_otf_to_script (Lisp_Object otf)
 {
@@ -329,7 +329,7 @@ static NSString
 
 /* Searches the :script, :lang, and :otf extra-bundle properties of the spec,
    plus registry regular property, for something that can be mapped to a
-   unicode script.  Empty string returned if no script spec found. */
+   Unicode script.  Empty string returned if no script spec found. */
 static NSString
 *ns_get_req_script (Lisp_Object font_spec)
 {
@@ -385,7 +385,7 @@ accumulate_script_ranges (Lisp_Object arg, Lisp_Object range, Lisp_Object val)
 }
 
 
-/* Use the unicode range information in Vchar_script_table to convert a script
+/* Use the Unicode range information in Vchar_script_table to convert a script
    name into an NSCharacterSet. */
 static NSCharacterSet
 *ns_script_to_charset (NSString *scriptName)
@@ -426,7 +426,7 @@ static NSCharacterSet
    If none are found, we reduce the percentage and try again, until 5%.
    This provides a font with at least some characters if such can be found.
    We don't use isSupersetOfSet: because (a) it doesn't work on Tiger, and
-   (b) need approximate match as fonts covering full unicode ranges are rare. */
+   (b) need approximate match as fonts covering full Unicode ranges are rare. */
 static NSSet
 *ns_get_covering_families (NSString *script, float pct)
 {
@@ -1292,7 +1292,7 @@ ns_uni_to_glyphs (struct nsfont_info *font_info, unsigned char block)
   if (!unichars || !(font_info->glyphs[block]))
     abort ();
 
-  /* create a string containing all unicode characters in this block */
+  /* create a string containing all Unicode characters in this block */
   for (idx = block<<8, i =0; i<0x100; idx++, i++)
     if (idx < 0xD800 || idx > 0xDFFF)
       unichars[i] = idx;
@@ -1487,5 +1487,5 @@ syms_of_nsfont (void)
   DEFSYM (Qroman, "roman");
   DEFSYM (Qmedium, "medium");
   DEFVAR_LISP ("ns-reg-to-script", Vns_reg_to_script,
-               doc: /* Internal use: maps font registry to unicode script. */);
+               doc: /* Internal use: maps font registry to Unicode script. */);
 }
diff --git a/src/nsterm.h b/src/nsterm.h
index 574d31c962a..52246caac84 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -470,7 +470,7 @@ struct nsfont_info
   XCharStruct max_bounds;
   /* we compute glyph codes and metrics on-demand in blocks of 256 indexed
      by hibyte, lobyte */
-  unsigned short **glyphs; /* map unicode index to glyph */
+  unsigned short **glyphs; /* map Unicode index to glyph */
   struct font_metrics **metrics;
 };
 
diff --git a/src/w32fns.c b/src/w32fns.c
index 5b936195aa5..434861320a5 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2943,7 +2943,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
       break;
 
     case WM_IME_CHAR:
-      /* If we can't get the IME result as unicode, use default processing,
+      /* If we can't get the IME result as Unicode, use default processing,
          which will at least allow characters decodable in the system locale
          get through.  */
       if (!get_composition_string_fn)
diff --git a/src/w32font.c b/src/w32font.c
index bd58e7e757b..5cc37c0e74f 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -462,7 +462,7 @@ w32font_has_char (Lisp_Object entity, int c)
    Return a glyph code of FONT for character C (Unicode code point).
    If FONT doesn't have such a glyph, return FONT_INVALID_CODE.
 
-   For speed, the gdi backend uses unicode (Emacs calls encode_char
+   For speed, the gdi backend uses Unicode (Emacs calls encode_char
    far too often for it to be efficient). But we still need to detect
    which characters are not supported by the font.
   */
@@ -620,7 +620,7 @@ w32font_text_extents (struct font *font, unsigned *code,
       total_width = size.cx;
     }
 
-  /* On 95/98/ME, only some unicode functions are available, so fallback
+  /* On 95/98/ME, only some Unicode functions are available, so fallback
      on doing a dummy draw to find the total width.  */
   if (!total_width)
     {
@@ -1153,7 +1153,7 @@ w32_enumfont_pattern_entity (Lisp_Object frame,
   else
     ASET (entity, FONT_SIZE_INDEX, make_number (0));
 
-  /* Cache unicode codepoints covered by this font, as there is no other way
+  /* Cache Unicode codepoints covered by this font, as there is no other way
      of getting this information easily.  */
   if (font_type & TRUETYPE_FONTTYPE)
     {
@@ -1514,7 +1514,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font,
   /* Skip non matching fonts.  */
 
   /* For uniscribe backend, consider only truetype or opentype fonts
-     that have some unicode coverage.  */
+     that have some Unicode coverage.  */
   if (match_data->opentype_only
       && ((!(physical_font->ntmTm.ntmFlags & NTMFLAGS_OPENTYPE)
            && !(font_type & TRUETYPE_FONTTYPE))
@@ -1557,7 +1557,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font,
       Lisp_Object spec_charset = AREF (match_data->orig_font_spec,
                                        FONT_REGISTRY_INDEX);
 
-      /* iso10646-1 fonts must contain unicode mapping tables.  */
+      /* iso10646-1 fonts must contain Unicode mapping tables.  */
       if (EQ (spec_charset, Qiso10646_1))
         {
           if (!is_unicode)
@@ -1572,7 +1572,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font,
               && !(physical_font->ntmFontSig.fsUsb[0] & 0x007F001F))
             return 1;
         }
-      /* unicode-sip fonts must contain characters in unicode plane 2.
+      /* unicode-sip fonts must contain characters in Unicode plane 2.
          so look for bit 57 (surrogates) in the Unicode subranges, plus
          the bits for CJK ranges that include those characters.  */
       else if (EQ (spec_charset, Qunicode_sip))
@@ -1597,7 +1597,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font,
             ASET (entity, FONT_REGISTRY_INDEX, spec_charset);
         }
       /* Otherwise if using the uniscribe backend, report ANSI and DEFAULT
-         fonts as unicode and skip other charsets.  */
+         fonts as Unicode and skip other charsets.  */
       else if (match_data->opentype_only)
         {
           if (logical_font->elfLogFont.lfCharSet == ANSI_CHARSET
@@ -1640,7 +1640,7 @@ x_to_w32_charset (char * lpcs)
   if (strncmp (lpcs, "*-#", 3) == 0)
     return atoi (lpcs + 3);
 
-  /* All Windows fonts qualify as unicode.  */
+  /* All Windows fonts qualify as Unicode.  */
   if (!strncmp (lpcs, "iso10646", 8))
     return DEFAULT_CHARSET;
 
@@ -1925,7 +1925,7 @@ w32_registry (LONG w32_charset, DWORD font_type)
 {
   char *charset;
 
-  /* If charset is defaulted, charset is unicode or unknown, depending on
+  /* If charset is defaulted, charset is Unicode or unknown, depending on
      font type.  */
   if (w32_charset == DEFAULT_CHARSET)
     return font_type == TRUETYPE_FONTTYPE ? Qiso10646_1 : Qunknown;
@@ -2080,7 +2080,7 @@ fill_in_logfont (FRAME_PTR f, LOGFONT *logfont, Lisp_Object font_spec)
         {
           Lisp_Object key, val;
           key = XCAR (tmp), val = XCDR (tmp);
-          /* Only use QCscript if charset is not provided, or is unicode
+          /* Only use QCscript if charset is not provided, or is Unicode
              and a single script is specified.  This is rather crude,
              and is only used to narrow down the fonts returned where
              there is a definite match.  Some scripts, such as latin, han,
diff --git a/src/w32menu.c b/src/w32menu.c
index 39d101e7bd5..9b2d014cd58 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1219,7 +1219,7 @@ simple_dialog_show (FRAME_PTR f, Lisp_Object contents, Lisp_Object header)
      is_simple_dialog, we don't need to worry about checking contents
      to see what type of dialog to use.  */
 
-  /* Use unicode if possible, so any language can be displayed.  */
+  /* Use Unicode if possible, so any language can be displayed.  */
   if (unicode_message_box)
     {
       WCHAR *text, *title;
@@ -1476,7 +1476,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
                                           utf16_string);
       if (!return_value)
         {
-          /* On W9x/ME, unicode menus are not supported, though AppendMenuW
+          /* On W9x/ME, Unicode menus are not supported, though AppendMenuW
              apparently does exist at least in some cases and appears to be
              stubbed out to do nothing.  out_string is UTF-8, but since
              our standard menus are in English and this is only going to
@@ -1486,7 +1486,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
             AppendMenu (menu, fuFlags,
                         item != NULL ? (UINT) item: (UINT) wv->call_data,
                         out_string);
-          /* Don't use unicode menus in future.  */
+          /* Don't use Unicode menus in future.  */
           unicode_append_menu = NULL;
         }
 
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index 36197b3b28a..63da3b9e962 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -469,7 +469,7 @@ uniscribe_encode_char (struct font *font, int c)
 
   /* Non BMP characters must be handled by the uniscribe shaping
      engine as GDI functions (except blindly displaying lines of
-     unicode text) and the promising looking ScriptGetCMap do not
+     Unicode text) and the promising looking ScriptGetCMap do not
      convert surrogate pairs to glyph indexes correctly.  */
     {
       items = (SCRIPT_ITEM *) alloca (sizeof (SCRIPT_ITEM) * 2 + 1);
@@ -581,7 +581,7 @@ add_opentype_font_name_to_list (ENUMLOGFONTEX *logical_font,
       && font_type != TRUETYPE_FONTTYPE)
     return 1;
 
-  /* Skip fonts that have no unicode coverage.  */
+  /* Skip fonts that have no Unicode coverage.  */
   if (!physical_font->ntmFontSig.fsUsb[3]
       && !physical_font->ntmFontSig.fsUsb[2]
       && !physical_font->ntmFontSig.fsUsb[1]