Merge from emacs-24; up to 2012-05-07T14:57:18Z!michael.albinus@gmx.de

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

diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 6a48b09..e68966b 100644 (file)
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -4027,7 +4027,7 @@
        * dispextern.h (struct glyph_row): Flag internal_border_p removed.
 
        * xfns.c (x_create_tip_frame): Don't set bitmapIcon resource
-       because this will try to access a nonexisting widget.
+       because this will try to access a nonexistent widget.
 
 1999-07-26  Markus Rost  <rost@gnu.org>
 
@@ -11485,7 +11485,7 @@
        Substitute homedir by `~' also in default_filename.
 
        * xdisp.c (try_window_id): Fix computation of tab_offset when
-       backing up over a character that is splitted across lines.
+       backing up over a character that is split across lines.
 
 1999-05-08  Kenichi HANDA  <handa@etl.go.jp>
 
@@ -13203,7 +13203,7 @@
        * w32.c (stat): GetFileInformationByHandle can legitimately fail,
        so don't rely on it succeeding.
 
-       * w32fns.c (x_to_w32_font): Specify DEFAULT_CHARSET in the w32
+       * w32fns.c (x_to_w32_font): Specify DEFAULT_CHARSET in the Windows
        LOGFONT struct if x font doesn't specify the charset.
        (x_to_w32_charset): Change >= to == when testing results of
        stricmp.
@@ -13979,7 +13979,7 @@
 
 See ChangeLog.7 for earlier changes.
 
-  Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
+  Copyright (C) 1999, 2001-2012  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.