Merge from emacs-24; up to 2012-12-26T16:22:18Z!michael.albinus@gmx.de

[bpt/emacs.git] / src / ChangeLog.10

diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index e759183..508a2a9 100644 (file)
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -15816,16 +15816,16 @@
        Add prototypes.
 
        * macterm.c (mac_draw_bitmap): Add overlay_p arg.
-       (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps;
+       (x_draw_fringe_bitmap): Handle overlaid fringe bitmaps;
        thanks to YAMAMOTO Mitsuharu for advice on how to do this.
        Use cursor color for displaying cursor in fringe.
        (x_redisplay_interface): Add null handlers for
        define_fringe_bitmap and destroy_fringe_bitmap functions.
 
        * w32term.c (w32_draw_fringe_bitmap): Copy unadapted code from
-       xterm.c to handle overlayed fringe bitmaps and to use cursor color
+       xterm.c to handle overlaid fringe bitmaps and to use cursor color
        for displaying cursor in fringe.
-       (w32_define_fringe_bitmap, w32_destroy_fringe_bitmap): New W32
+       (w32_define_fringe_bitmap, w32_destroy_fringe_bitmap): New Windows
        specific functions to define and destroy fringe bitmaps in fringe_bmp.
        (w32_redisplay_interface): Add them to redisplay_interface.
        (w32_term_init): Call w32_init_fringe instead of explicitly
@@ -15849,7 +15849,7 @@
        (display_line): Handle cursor in fringe at eob.
        (display_line): Set row user fringe bitmaps from iterator.
 
-       * xterm.c (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
+       * xterm.c (x_draw_fringe_bitmap): Handle overlaid fringe bitmaps.
        Use cursor color for displaying cursor in fringe.
        (x_redisplay_interface): Add null handlers for
        define_fringe_bitmap and destroy_fringe_bitmap functions.
@@ -19171,7 +19171,7 @@
        * coding.c (code_convert_region_unwind):
        Set Vlast_coding_system_used to the argument.
        (code_convert_region): If post-read-conversion function changed
-       the value of last-coding-sytem, keep the new value in
+       the value of last-coding-system, keep the new value in
        coding->symbol so that it won't be overridden.
        (run_pre_post_conversion_on_str): Likewise.
        (coding_system_accept_latin_extra_p): New function.
@@ -20972,7 +20972,7 @@
 
 2002-12-30  Richard Dawe  <rich@phekda.freeserve.co.uk>
 
-       * src/config.in (!HAVE_SIZE_T): Fix order of arguments in
+       * config.in (!HAVE_SIZE_T): Fix order of arguments in
        type definition of size_t.
 
 2003-01-02  Steven Tamm  <steventamm@mac.com>
@@ -21476,7 +21476,7 @@
        "Emacs built on Windows 9x/ME crashes at startup on Windows XP,
        or Emacs builtpart of on XP crashes at startup on Windows 9x/ME."
 
-       * w32.c: Added wrapper functions around the win32 API functions
+       * w32.c: Added wrapper functions around the Windows API functions
        OpenProcessToken, GetTokenInformation, LookupAccountSid, and
        GetSidIdentifierAuthority.  These wrapper functions serve two
        purposes:
@@ -21490,7 +21490,7 @@
        the version of advapi32.dll that is found in the 9x branch of
        Microsoft Windows.
 
-       * w32.c (init_user_info): Replace the calls to the win32 API
+       * w32.c (init_user_info): Replace the calls to the Windows API
        functions OpenProcessToken, GetTokenInformation, LookupAccountSid,
        and GetSidIdentifierAuthority with calls to the newly added
        wrapper functions.
@@ -23215,7 +23215,7 @@
 
        * macterm.c (do_ae_open_documents) [MAC_OSX]: Call FSpMakeFSRef
        and FSRefMakePath to convert FSSpec returned with Apple Event to
-       Posix pathname.
+       POSIX pathname.
        (mac_initialize) [TARGET_API_MAC_CARBON]:
        Call init_required_apple_events and disable the `Quit' menu item
        provided automatically by the Carbon Toolbox.
@@ -27912,7 +27912,7 @@ See ChangeLog.9 for earlier changes.
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2001-2011 Free Software Foundation, Inc.
+    Copyright (C) 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.