Merge from trunk.

[gnu-emacs] / src / ChangeLog.3

diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 0d0d107101dd133267b7459e8ee5c5840f535b34..beb7a0a2ae16548651b2cfe6f44549b7e8594510 100644 (file)
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -6993,7 +6993,7 @@
 
        * keyboard.c (Qvertical_split): Renamed to `vertical-line',
        since the window arrangement is actually referred to as a
-       `horizontal split.'
+       `horizontal split'.
        (make_lispy_event, make_lispy_movement, syms_of_keyboard): Uses
        renamed here.
        * keyboard.h (Qvertical_split): Extern declaration changed here.
@@ -14197,7 +14197,7 @@
 1989-12-14  Joseph Arceneaux  (jla@spiff)
 
        * xfns.c: New variable Vx_no_window_manager.
-        (Fx_track_pointer): If bufp < 0, abort.
+       (Fx_track_pointer): If bufp < 0, abort.
 
        * xterm.c (XTread_socket): When leaving window, set x_mouse_x and
        x_mouse_y to -1.
@@ -16507,8 +16507,7 @@ See ChangeLog.2 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-       Free Software Foundation, Inc.
+  Copyright (C) 1993, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -16524,5 +16523,3 @@ See ChangeLog.2 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/>.
-
-;;; arch-tag: 136a8e5c-4f83-403b-9132-874f1c47f8a9