Merge from emacs-24; up to 2012-12-21T07:35:02Z!ueno@gnu.org

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

diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 781027e..1195a8f 100644 (file)
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -3994,7 +3994,8 @@
 
 2010-09-24  Juanma Barranquero  <lekktu@gmail.com>
 
-       Remove W32 API function pointer unused since 2005-02-15 (revno 2005-02-15T23:19:26Z!jasonr@gnu.org).
+       Remove Windows API function pointer unused since 2005-02-15 (revno
+       2005-02-15T23:19:26Z!jasonr@gnu.org).
        * w32fns.c (clipboard_sequence_fn): Don't declare.
        (globals_of_w32fns): Don't initialize it.
 
@@ -5531,7 +5532,7 @@
        (update_frame_tool_bar): Remove old_req, new_req.  Do not get tool bar
        height, call xg_update_tool_bar_sizes instead.
        (free_frame_tool_bar): Remove from hbox or vbox depending on
-       toolbar_in_hbox,  Set all FRAME_TOOLBAR_*_(WIDTH|HEIGHT) to zero.
+       toolbar_in_hbox.  Set all FRAME_TOOLBAR_*_(WIDTH|HEIGHT) to zero.
        (xg_change_toolbar_position): New function.
 
        * frame.h (struct frame): Add tool_bar_position.
@@ -31382,7 +31383,7 @@ See ChangeLog.10 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2007-2012  Free Software Foundation, Inc.
+  Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.