aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/dispnew.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d29988b39ba..960e4e52c59 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -10687,7 +10687,7 @@
106872012-05-09 Michael Albinus <michael.albinus@gmx.de> 106872012-05-09 Michael Albinus <michael.albinus@gmx.de>
10688 10688
10689 * dbusbind.c (xd_registered_buses): New internal Lisp object. 10689 * dbusbind.c (xd_registered_buses): New internal Lisp object.
10690 Rename all occurences of Vdbus_registered_buses to xd_registered_buses. 10690 Rename all occurrences of Vdbus_registered_buses to xd_registered_buses.
10691 (syms_of_dbusbind): Remove declaration of Vdbus_registered_buses. 10691 (syms_of_dbusbind): Remove declaration of Vdbus_registered_buses.
10692 Initialize xd_registered_buses. 10692 Initialize xd_registered_buses.
10693 10693
diff --git a/src/dispnew.c b/src/dispnew.c
index 89ee09a8432..27a5d2ae113 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4022,7 +4022,7 @@ set_window_cursor_after_update (struct window *w)
4022 } 4022 }
4023 4023
4024 /* Window cursor can be out of sync for horizontally split windows. 4024 /* Window cursor can be out of sync for horizontally split windows.
4025 Horisontal position is -1 when cursor is on the left fringe. */ 4025 Horizontal position is -1 when cursor is on the left fringe. */
4026 hpos = clip_to_bounds (-1, hpos, w->current_matrix->matrix_w - 1); 4026 hpos = clip_to_bounds (-1, hpos, w->current_matrix->matrix_w - 1);
4027 vpos = clip_to_bounds (0, vpos, w->current_matrix->nrows - 1); 4027 vpos = clip_to_bounds (0, vpos, w->current_matrix->nrows - 1);
4028 rif->cursor_to (vpos, hpos, cy, cx); 4028 rif->cursor_to (vpos, hpos, cy, cx);