1 files changed, 19 insertions, 20 deletions

diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 6152b4c76af..10de7e53794 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -516,7 +516,7 @@
         * w32fns.c (current_popup_menu): Use from w32menu.c.
         (w32_wnd_proc) <WM_EXITMENULOOP, WM_TIMER>: Use menubar_active
         and current_popup_menu to determine whether a menubar menu has
-        been cancelled.
+        been canceled.
 
         * w32term.h (w32_output): Remove menu_command_in_progress.
 
@@ -1003,7 +1003,7 @@
         (syms_of_xdisp): DEFVAR_LISP and initialize it.  Update doc string
         to describe new value `grow-only', and use of C-l.
         (display_tool_bar_line): Only use default face for border below
-        toolbar if not grow-only (to get acceptable visual appearence).
+        toolbar if not grow-only (to get acceptable visual appearance).
         Explicitly set visible_height for empty toolbar lines.
         (redisplay_tool_bar): Handle `grow-only' setting.  Check and clear
         minimize_tool_bar_window_p flag.
@@ -4346,7 +4346,7 @@
 
         * textprop.c (Fremove_list_of_text_properties):
         Ensure modify_region is called only when buffer is modified and that
-        signal_after_change is allways called in that case.
+        signal_after_change is always called in that case.
 
         * print.c (PRINTFINISH): Call signal_after_change.
 
@@ -5084,7 +5084,7 @@
 
 2006-02-26  Chong Yidong  <cyd@stupidchicken.com>
 
-        * xterm.h, xterm.c (x_uncatch_errors): Delete unneccessary argument.
+        * xterm.h, xterm.c (x_uncatch_errors): Delete unnecessary argument.
 
         * xterm.c (x_load_font, x_term_init, XTmouse_position)
         (handle_one_xevent, x_connection_closed, x_list_fonts):
@@ -5133,7 +5133,7 @@
         it can be called in a signal handler.
         (x_catch_errors_unwind): Function deleted.
         (x_uncatch_errors): Deallocate last x_error_message_stack struct.
-        (x_check_errors): Call x_uncatch_errors before signalling error.
+        (x_check_errors): Call x_uncatch_errors before signaling error.
 
         (x_load_font, x_term_init, XTmouse_position, handle_one_xevent)
         (x_connection_closed, x_list_fonts): Use new versions of
@@ -6387,7 +6387,7 @@
 2005-11-20  Nick Roberts  <nickrob@snap.net.nz>
 
         * lisp.h: Use typedef when Lisp_Object is EMACS_INT so that
-        this type is recognised when debugging.
+        this type is recognized when debugging.
 
 2005-11-19  Andreas Schwab  <schwab@suse.de>
 
@@ -12087,7 +12087,7 @@
         (merge_face_heights): Eliminate GCPRO arg.  All callers changed.
 
         * keyboard.c (command_loop_1): Change Vtransient_mark_mode
-        before deciding whether to inactivate mark.
+        before deciding whether to deactivate mark.
 
 2004-11-06  Lars Brinkhoff  <lars@nocrew.org>
 
@@ -13398,7 +13398,7 @@
 2004-07-04  John Paul Wallington  <jpw@gnu.org>
 
         * fileio.c (read_file_name_completion_ignore_case): New variable.
-        (syms_of_fileio): Declare and initialise it.
+        (syms_of_fileio): Declare and initialize it.
         (Fread_file_name): Bind `completion-ignore-case' to respect it.
 
 2004-07-03  Eli Zaretskii  <eliz@gnu.org>
@@ -15816,14 +15816,14 @@
         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
         specific functions to define and destroy fringe bitmaps in fringe_bmp.
@@ -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.
@@ -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.
 
@@ -19139,7 +19139,7 @@
         (font_rescale_ratio): New function.
         (split_font_name): If NUMERIC_P is nonzero, set font->rescale_ratio.
         (better_font_p): On comparing point sized, pay attention to
-        recale_ratio member of fonts.
+        rescale_ratio member of fonts.
         (build_scalable_font_name): Reflect font->rescale_ratio in the
         font name.
         (syms_of_xfaces): Declare Vface_font_rescale_alist as a Lisp variable.
@@ -20702,11 +20702,11 @@
         (free_frame_menubar): Only compile if not USE_GTK.  GTK version
         is in gtkutil.c.
         (popup_selection_callback): New version for USE_GTK.
-        (create_and_show_popup_menu): New fuction, one USE_GTK version and
+        (create_and_show_popup_menu): New function, one USE_GTK version and
         one USE_X_TOOLKIT version.
         (xmenu_show): Call create_and_show_popup_menu.
         (dialog_selection_callback): New version for USE_GTK.
-        (create_and_show_dialog): New fuction, one USE_GTK version and
+        (create_and_show_dialog): New function, one USE_GTK version and
         one USE_X_TOOLKIT version.
         (xdialog_show): Call create_and_show_dialog.
 
@@ -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>
@@ -22780,7 +22780,7 @@
 2002-07-23  Kenichi Handa  <handa@etl.go.jp>
 
         * xdisp.c (face_before_or_after_it_pos):
-        Call FETCH_MULTIBYTE_CHAR with byte postion, not char position.
+        Call FETCH_MULTIBYTE_CHAR with byte position, not char position.
 
 2002-07-22  Juanma Barranquero  <lektu@terra.es>
 
@@ -23013,7 +23013,7 @@
         (try_window_id): Likewise.
         (redisplay_window): New local var buffer_unchanged_p.
 
-        * keyboard.c (cmd_error) [HAVE_X_WINDOWS]: Maybe call cancel_houglass.
+        * keyboard.c (cmd_error) [HAVE_X_WINDOWS]: Maybe call cancel_hourglass.
 
         * process.c (create_process): Test USG_SUBTTY_WORKS.
         (process_send_signal): Clean up handling of GID.
@@ -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-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -27928,4 +27928,3 @@ See ChangeLog.9 for earlier changes.
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-