Merge from emacs-23

[gnu-emacs] / src / ChangeLog.3

diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 36239b1e85e58004595469612d9735f98046f083..cf336ca3eab1abb8af2695c192b9e6cc0ffd6f84 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.