1 files changed, 67 insertions, 68 deletions

diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 6f462e32534..97d5a65281a 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -533,8 +533,8 @@
         * deps.mk (getloadavg.o): Remove; gnulib now does this.
         * lisp.h (getloadavg) [!defined HAVE_GETLOADAVG]: Remove; gnulib
         now does this.
-        * src/s/freebsd.h (HAVE_GETLOADAVG): Remove; gnulib now does this.
-        * src/s/netbsd.h (HAVE_GETLOADAVG): Likewise.
+        * s/freebsd.h (HAVE_GETLOADAVG): Remove; gnulib now does this.
+        * s/netbsd.h (HAVE_GETLOADAVG): Likewise.
         * config.in: Regenerate.
 
 2011-02-15  Eli Zaretskii  <eliz@gnu.org>
@@ -966,7 +966,7 @@
         ($(BLD)/editfns.$(O)): Depend on ../lib/strftime.h.
         ($(BLD)/print.$(O)): Depend on ../lib/ftoastr.h and ../lib/intprops.h.
 
-        * deps.mk: Update for recent changes: gnutls support, gnulib
+        * deps.mk: Update for recent changes: GnuTLS support, gnulib
         imports, addition of globals.h.
 
         * makefile.w32-in ($(BLD)/sysdep.$(O)): Depend on
@@ -2191,7 +2191,7 @@
 2010-12-16  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.m (ns_draw_window_cursor): If the cursor color is the
-        same as the background, use the face forground as cursor.
+        same as the background, use the face foreground as cursor.
 
 2010-12-13  Eli Zaretskii  <eliz@gnu.org>
 
@@ -2927,7 +2927,7 @@
         * nsimage.m (EmacsImage-setXBMColor:): Correct previous patch:
         don't change the method signature, change the return.
 
-2010-11-04  Ismail Donmez  <ismail@namtrac.org>  (tiny change)
+2010-11-04  İsmail Dönmez  <ismail@namtrac.org>  (tiny change)
 
         * nsfont.m (nsfont_draw)
         * nsimage.m (EmacsImage-setXBMColor:)
@@ -3268,7 +3268,7 @@
 2010-10-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnutls.c (emacs_gnutls_write): If we're trying to write before
-        gnutls is ready, return EAGAIN as the errno.
+        GnuTLS is ready, return EAGAIN as the errno.
 
 2010-10-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
@@ -3538,7 +3538,6 @@
         * nsmenu.m (syms_of_nsmenu):
         * nsfns.m (syms_of_nsfns):
         * msdos.c (syms_of_msdos):
-
         * image.c (syms_of_image):
         * charset.c (syms_of_charset): Use intern_c_string instead of intern.
 
@@ -3585,12 +3584,12 @@
         * process.c (make_process): Set the gnutls_p field to zero by
         default.
         (read_process_output): Always call the gnutls_read function if the
-        stream is a gnutls stream.
+        stream is a GnuTLS stream.
         (send_process): Ditto for writes.
 
         * gnutls.c (emacs_gnutls_write, emacs_gnutls_read): Refuse to read
         or write anything until the state is GNUTLS_STAGE_READY.
-        (Fgnutls_boot): Mark the stream as being a gnutls stream.
+        (Fgnutls_boot): Mark the stream as being a GnuTLS stream.
 
 2010-09-29  Eli Zaretskii  <eliz@gnu.org>
 
@@ -4388,7 +4387,7 @@
         * xml.c (Fxml_parse_string, Fxml_parse_string): Revert last change.
         Don't make first argument optional.  Doc fix.
 
-2010-09-14  Leo  <sdl.web@gmail.com>  (tiny change)
+2010-09-14  Leo Liu  <sdl.web@gmail.com>  (tiny change)
 
         * xml.c (Fxml_parse_string, Fhtml_parse_string): Fix up the
         parameters for the doc string.
@@ -4547,7 +4546,7 @@
 
         * composite.c (composition_compute_stop_pos): In forward search,
         pay attention to the possibility that some character after ENDPOS
-        will be composed with charactrs before ENDPOS.
+        will be composed with characters before ENDPOS.
 
 2010-08-24  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -4839,7 +4838,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)
@@ -5896,7 +5895,7 @@
         * eval.c (Feval, Ffuncall): Use the new names.
 
         * lisp.h (struct Lisp_Subr): Rename `am' to aMANY and add aUNEVALLED.
-        (DEFUN): Add braces around the union initialisation and use ## to
+        (DEFUN): Add braces around the union initialization and use ## to
         specify the right union alternative and avoid a cast.
 
 2010-07-18  Juanma Barranquero  <lekktu@gmail.com>
@@ -6604,9 +6603,9 @@
         * keyboard.c (input_available_signal): Declare.
         (kbd_buffer_nr_stored): New function.
         (kbd_buffer_store_event_hold): If kbd_buffer_nr_stored returns
-        more than KBD_BUFFER_SIZE/2, stop reding input (Bug#6571).
+        more than KBD_BUFFER_SIZE/2, stop reading input (Bug#6571).
         (kbd_buffer_get_event): If input is suspended and kbd_buffer_nr_stored
-        returns less than KBD_BUFFER_SIZE/4, resume reding input (Bug#6571).
+        returns less than KBD_BUFFER_SIZE/4, resume reading input (Bug#6571).
         (tty_read_avail_input): If input is on hold, return.
         Don't read more that free slots in kbd_buffer (Bug#6571).
 
@@ -7199,7 +7198,7 @@
 
 2010-06-27  Chong Yidong  <cyd@stupidchicken.com>
 
-        * xfns.c (Fx_create_frame): Don't consult X resouces when setting
+        * xfns.c (Fx_create_frame): Don't consult X resources when setting
         menu-bar-lines and tool-bar-lines.  Use menu-bar-mode and
         tool-bar-mode, which are now set using these X resources at
         startup, to determine the defaults (Bug#2249).
@@ -7683,7 +7682,7 @@
 
 2010-05-20  Juri Linkov  <juri@jurta.org>
 
-        * fileio.c (Fdelete_file): Change interative spec to use
+        * fileio.c (Fdelete_file): Change interactive spec to use
         `read-file-name' like in `find-file-read-args' where the default
         value is `default-directory' instead of `buffer-file-name'.
         http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00533.html
@@ -7949,7 +7948,7 @@
 2010-05-11  Karel Klíč  <kklic@redhat.com>
 
         * ftfont.c: Fix incorrect parentheses of #if condition for
-        definining M17N_FLT_USE_NEW_FEATURE.
+        defining M17N_FLT_USE_NEW_FEATURE.
 
 2010-05-11  Glenn Morris  <rgm@gnu.org>
 
@@ -8991,8 +8990,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.
@@ -9266,7 +9265,7 @@
 
         Get rid of the direct_output optimizations.
         * keyboard.c (nonundocount): Remove extern declaration.
-        (command_loop_1): Remove brittle optimisation for cheap and
+        (command_loop_1): Remove brittle optimization for cheap and
         common operations.
         * xdisp.c (redisplay_internal): Don't bother checking
         redisplay_performed_directly_p any more.
@@ -9628,7 +9627,7 @@
         * frame.c (Vdefault_frame_scroll_bars): Put non-GTK X scroll-bars
         on left.
 
-2010-03-13  Andreas Politz  <politza@fh-trier.de>  (tiny change)
+2010-03-13  Andreas Politz  <politza@fh-trier.de>
 
         * editfns.c (Fformat): Account for string precision when computing
         field width (Bug#5710).
@@ -9864,8 +9863,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 +11540,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.
 
@@ -11805,7 +11804,7 @@
         * coding.c (encode_coding_utf_16): Fix checking of a Unicode
         character.
 
-        * cmds.c (Fself_insert_command): Avoid unnecessay
+        * cmds.c (Fself_insert_command): Avoid unnecessary
         unibyte->multibyte conversion.  (Bug#4240)  (Bug#4037)
 
 2009-08-26  Dan Nicolaescu  <dann@ics.uci.edu>
@@ -11923,7 +11922,7 @@
 
         * process.c (status_notify): Don't perform redisplay.
         (Fdelete_process, list_processes_1, process_send_signal):
-        Expliticly perform redisplay.
+        Explicitly perform redisplay.
         (wait_reading_process_output): Always check process status, but
         don't perform redisplay unless DO_DISPLAY is non-zero (Bug#2930).
 
@@ -11972,7 +11971,7 @@
 
         * image.c (xbm_read_bitmap_data): New arg inhibit_image_error.
         (xbm_load_image): Caller changed.
-        (xbm_file_p): Avoid signalling an image_error (Bug#4107).
+        (xbm_file_p): Avoid signaling an image_error (Bug#4107).
 
 2009-08-13  Nick Roberts  <nickrob@snap.net.nz>
 
@@ -12481,7 +12480,7 @@
 
         * dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
         xd_symbol_to_dbus_type.  With Solaris 2.11, it was said to compile
-        for hours, when optimzation is enabled.
+        for hours, when optimization is enabled.
         (xd_signature, xd_append_arg, xd_retrieve_arg, xd_initialize)
         (xd_read_message): Make them static.
 
@@ -12540,7 +12539,7 @@
 
 2009-06-23  Jim Meyering  <meyering@redhat.com>
 
-        * src/ftfont.c (setup_otf_gstring, ftfont_shape_by_flt):
+        * ftfont.c (setup_otf_gstring, ftfont_shape_by_flt):
         Use xmalloc and xrealloc (not malloc and realloc), so subsequent heap
         pointer dereferences are guaranteed to be valid.
 
@@ -12897,7 +12896,7 @@
         * font.c (font_update_drivers): Sanity fallback to avoid disabling
         all drivers.
 
-        * nsterm.m (-windowDidResize:): Avoid inf-loop under GNUStep.
+        * nsterm.m (-windowDidResize:): Avoid inf-loop under GNUstep.
 
 2009-05-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
@@ -13149,7 +13148,7 @@
         (ftfont_has_char): Special handling of `ja' and `ko' adstyle.
 
         * font.c (font_sort_entites): Change the meaning of the arg
-        BEST-ONLY.  Don't optimize for VEC of lenght 1.
+        BEST-ONLY.  Don't optimize for VEC of length 1.
         (font_select_entity): Just return the value of font_sort_entites.
 
         * xfaces.c (merge_face_vectors): Reflect font properties in
@@ -16072,7 +16071,7 @@
 2008-09-07  Andreas Schwab  <schwab@suse.de>
 
         * callproc.c (Fcall_process): Don't hold references to string data
-        across garbage collection.  Move initialisation of new_argv down
+        across garbage collection.  Move initialization of new_argv down
         to avoid compiler bug.
 
 2008-09-07  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
@@ -16658,7 +16657,7 @@
 2008-08-20  Chong Yidong  <cyd@stupidchicken.com>
 
         * xselect.c (x_get_foreign_selection): Return nil if desired
-        selection could not be obtained, instead of signalling an error.
+        selection could not be obtained, instead of signaling an error.
 
 2008-08-20  David Reitter  <david.reitter@gmail.com>
 
@@ -17147,10 +17146,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 +19177,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>
 
@@ -19248,7 +19247,7 @@
         * w32menu.c (Fx_popup_menu): Unwind protect while building menu.
         (parse_single_submenu): Remove.
         (digest_single_submenu): Remove.
-        (syms_of_w32menu): Don't initialise variables that have moved
+        (syms_of_w32menu): Don't initialize variables that have moved
         to menu.c.
         (set_frame_menubar): Sync with version in xmenu.c.
         (w32_menu_show): Sync with xmenu_show in xmenu.c.
@@ -19647,7 +19646,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>
 
@@ -21290,7 +21289,7 @@
         (CACHE_BLOCKSIZE): New constants.
 
         * w32font.c (Qja, Qko, Qzh): New symbols.
-        (syms_of_w32font): Initialise them.
+        (syms_of_w32font): Initialize them.
         (font_matches_spec): Use them to filter by language.
         (recompute_cached_metrics): Remove function.
         (compute_metrics, clear_cached_metrics): New functions.
@@ -21813,8 +21812,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.
 
@@ -22234,7 +22233,7 @@
         * lisp.h (Fdelete_terminal): Declare.
 
         * charset.h (CHECK_CHARSET, CHECK_CHARSET_GET_ID)
-        (CHECK_CHARSET_GET_ATTR): Don't use the inexistent return value of
+        (CHECK_CHARSET_GET_ATTR): Don't use the nonexistent return value of
         wrong_type_argument.
 
 2008-02-22  Kenichi Handa  <handa@ni.aist.go.jp>
@@ -23182,7 +23181,7 @@
         * font.c (font_prop_validate_symbol, font_prop_validate_style)
         (font_prop_validate_non_neg, font_prop_validate_spacing):
         Delete argument prop_index.
-        (font_property_table): Change arguments to validater.  Change Callers.
+        (font_property_table): Change arguments to validator.  Change Callers.
         (font_lispy_object): Delete.
         (font_at): Use font_find_object instead fo font_lispy_object.
 
@@ -23463,10 +23462,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
@@ -23551,7 +23550,7 @@
         STORE_XCHARB a valid l-value.
 
         * w32term.c (w32_native_per_char_metric): Swap width and rbearing
-        calculations for non-Truetype fonts.
+        calculations for non-TrueType fonts.
         (x_draw_glyph_string): Sync with xterm.c.
         (x_draw_glyph_string_foreground) [USE_FONT_BACKEND]:
         Remove redundant code.
@@ -25081,7 +25080,7 @@
         * keymap.c (describe_vector): Handle default value of a char table.
 
         * fontset.c (fontset_face): Handle fallback fonts correctly.
-        (Ffontset_info): Return infomation about fallback fonts.
+        (Ffontset_info): Return information about fallback fonts.
 
 2008-02-01  Kenichi Handa  <handa@m17n.org>
 
@@ -25425,16 +25424,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 +25457,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.
@@ -25474,7 +25473,7 @@
 
         * term.c (terminal_encode_buffer): Make externally visible.
 
-        * makefile.w32-in: Add character.h dependancies.
+        * makefile.w32-in: Add character.h dependencies.
         (character.o, chartab.o): New targets.
 
 2008-02-01  Kenichi Handa  <handa@m17n.org>
@@ -26748,7 +26747,7 @@
 2008-02-01  Kenichi Handa  <handa@m17n.org>
 
         * 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.
 
 2008-02-01  Kenichi Handa  <handa@m17n.org>
 
@@ -27366,7 +27365,7 @@
 
         * ccl.c: Include "character.h".
         (Qccl, Qcclp): New variables.
-        (CCL_WRITE_CHAR): Alway treat the arg CH as a character even if
+        (CCL_WRITE_CHAR): Always treat the arg CH as a character even if
         it's less than 256.
         (CCL_WRITE_MULTIBYTE_CHAR): Delete.
         (CCL_WRITE_STRING, CCL_READ_CHAR): Adjust for the change of SRC
@@ -27685,7 +27684,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.
 
@@ -29136,7 +29135,7 @@
 
         * lisp.h (defvar_per_buffer, DEFVAR_PER_BUFFER):
         * lread.c (defvar_per_buffer):
-        * abbrev.c (syms_of_abbrev) <local-abbrev-tabl>: Move to buffer.c.
+        * abbrev.c (syms_of_abbrev) <local-abbrev-table>: Move to buffer.c.
 
         * window.c (candidate_window_p): Only consider as visible frames that
         are on the same terminal.
@@ -29523,7 +29522,7 @@
         (Fdisplay_buffer): Use it.
         (syms_of_window): Export, and initialize it.
 
-2007-09-06  Pixel  <pixel@mandriva.com>  (tiny change)
+2007-09-06  Pascal Rigaux  <pixel@mandriva.com>  (tiny change)
 
         * image.c (gif_load): Fix bug: Handle nonexistent colormap.
 
@@ -29651,7 +29650,7 @@
 
         * callproc.c (child_setup, getenv_internal): Use the
         display-environment-variable and term-environment-variable frame params.
-        (set_initial_environment): Initialise Vprocess_environment.
+        (set_initial_environment): Initialize Vprocess_environment.
 
         * config.in: Disable multi-keyboard support on a mac.
 
@@ -29718,7 +29717,7 @@
         * keyboard.c (restore_kboard_configuration): Only define when
         MULTI_KBOARD defined.
 
-        * makefile.w32-in: Update dependancies from Makefile.in.
+        * makefile.w32-in: Update dependencies from Makefile.in.
         (OBJ1): Add terminal.$(O)
 
         * term.c (dissociate_if_controlling_tty) [WINDOWSNT]:
@@ -30657,7 +30656,7 @@
         (display_buffer): Do not set split_height_threshold to twice the
         value of window_min_height to avoid changing the value of a
         customizable variable.  Rather explicitly check whether the
-        height of the window that shall be splitted is at least as large
+        height of the window that shall be split is at least as large
         as split_height_threshold.
         (Fwindow_full_width_p): New defun.
         (syms_of_window): Defsubr it.
@@ -30873,7 +30872,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>
 
@@ -30892,7 +30891,7 @@
 2007-06-14  Jason Rumney  <jasonr@gnu.org>
 
         * w32.c (get_process_times_fn): New function pointer.
-        (globals_of_w32): Intialize it if present in kernel32.dll.
+        (globals_of_w32): Initialize it if present in kernel32.dll.
         (w32_get_internal_run_time): New function.
 
         * editfns.c (Fget_internal_run_time) [WINDOWSNT]: Use it.
@@ -31298,7 +31297,7 @@
         (term_mouse_highlight, term_mouse_movement, term_mouse_position)
         (term_mouse_click, handle_one_term_event, Fterm_open_connection)
         (Fterm_close_connection): New functions.
-        (term_init): Initialise mouse_face_window.
+        (term_init): Initialize mouse_face_window.
 
 2007-05-19  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -31330,7 +31329,7 @@
 
 2007-05-12  Chong Yidong  <cyd@stupidchicken.com>
 
-        * image.c (pbm_load): Correctly check image size for greyscale pbm.
+        * image.c (pbm_load): Correctly check image size for grayscale pbm.
 
         * xterm.c (XTread_socket): Yet Another Uncaught X Error Crash (YAUXEC).
 
@@ -31383,7 +31382,7 @@ See ChangeLog.10 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2007-2011  Free Software Foundation, Inc.
+  Copyright (C) 2007-2012  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.