aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.3
diff options
context:
space:
mode:
authorKenichi Handa2010-05-14 13:15:58 +0900
committerKenichi Handa2010-05-14 13:15:58 +0900
commitccd3ce49e08b4f0c0e1bcbb34e9055ca4002e21c (patch)
tree0f53c077154c7cd5f05b339d91905dfd2391679d /src/ChangeLog.3
parent82ebc97b11a369303345927c98e7bc69928c9117 (diff)
parent508197067c434b0111bcb6ded742d424bb738ece (diff)
downloademacs-ccd3ce49e08b4f0c0e1bcbb34e9055ca4002e21c.tar.gz
emacs-ccd3ce49e08b4f0c0e1bcbb34e9055ca4002e21c.zip
merge trunk
Diffstat (limited to 'src/ChangeLog.3')
-rw-r--r--src/ChangeLog.32
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index fbe3f752aed..241019b51c7 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -14197,7 +14197,7 @@
141971989-12-14 Joseph Arceneaux (jla@spiff) 141971989-12-14 Joseph Arceneaux (jla@spiff)
14198 14198
14199 * xfns.c: New variable Vx_no_window_manager. 14199 * xfns.c: New variable Vx_no_window_manager.
14200 (Fx_track_pointer): If bufp < 0, abort. 14200 (Fx_track_pointer): If bufp < 0, abort.
14201 14201
14202 * xterm.c (XTread_socket): When leaving window, set x_mouse_x and 14202 * xterm.c (XTread_socket): When leaving window, set x_mouse_x and
14203 x_mouse_y to -1. 14203 x_mouse_y to -1.