auto upstream

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 @@
 2012-05-09  Michael Albinus  <michael.albinus@gmx.de>
 
         * dbusbind.c (xd_registered_buses): New internal Lisp object.
-        Rename all occurences of Vdbus_registered_buses to xd_registered_buses.
+        Rename all occurrences of Vdbus_registered_buses to xd_registered_buses.
         (syms_of_dbusbind): Remove declaration of Vdbus_registered_buses.
         Initialize xd_registered_buses.
 
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)
     }
 
   /* Window cursor can be out of sync for horizontally split windows.
-     Horisontal position is -1 when cursor is on the left fringe.   */
+     Horizontal position is -1 when cursor is on the left fringe.   */
   hpos = clip_to_bounds (-1, hpos, w->current_matrix->matrix_w - 1);
   vpos = clip_to_bounds (0, vpos, w->current_matrix->nrows - 1);
   rif->cursor_to (vpos, hpos, cy, cx);