Merge from emacs-24; up to 2012-12-23T02:41:17Z!rgm@gnu.org

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

diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index cbf8678..2f798e1 100644 (file)
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -3271,7 +3271,7 @@
        [not HAVE_X11] (x_set_border_pixel): Use gray_width and
        gray_height, instead of assuming that the bitmap is 16x16.
        (x_make_gc): Instead of creating a pixmap and then calling
-       XPutImage to make it into a grey stipple, just call
+       XPutImage to make it into a gray stipple, just call
        XCreatePixmapFromBitmapData to do it all at once.
 
        * xterm.c (x_text_icon): Move the request for font information
@@ -11154,7 +11154,7 @@
        (classify_object): Removed code to look up a function key in the
        global and local function key keymaps, since this will be done
        more generally.
-       (Fexecute_mouse_event): Elided this function with a #if 0;  I
+       (Fexecute_mouse_event): Elided this function with a #if 0; I
        think it will go away once the more general keymap stuff is
        implemented, but I'm not sure.
        (syms_of_keyboard): Removed defsubr for Sexecute_mouse_event.
@@ -14880,7 +14880,7 @@
 
 1989-08-09  Joseph Arceneaux  (jla@spiff)
 
-       * ../oldXMenu/Makefile: Removed all the unneccessary X stuff.
+       * ../oldXMenu/Makefile: Removed all the unnecessary X stuff.
 
 1989-08-07  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
 
@@ -16507,7 +16507,7 @@ See ChangeLog.2 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993, 2001-2011  Free Software Foundation, Inc.
+  Copyright (C) 1993, 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.