merge from trunk

5 files changed, 9 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6a3b7cf9cee..c8735ab96ae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,10 @@
 2013-08-13  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * keyboard.c (Fdiscard_input): Do not increment update_mode_lines.
+        * nsfns.m (x_set_cursor_type):
+        * w32fns.c (x_set_cursor_type):
+        * xfns.m (x_set_cursor_type): Do not set cursor_type_changed here...
+        * xdisp.c (set_frame_cursor_types): ...but in common code.
 
 2013-08-13  Dmitry Antipov  <dmantipov@yandex.ru>
 
diff --git a/src/nsfns.m b/src/nsfns.m
index ba0dba8c7e7..fc276c2b12d 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -860,11 +860,7 @@ static void
 x_set_cursor_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 {
   set_frame_cursor_types (f, arg);
-
-  /* Make sure the cursor gets redrawn.  */
-  cursor_type_changed = 1;
 }
-
 
 /* called to set mouse pointer color, but all other terms use it to
    initialize pointer types (and don't set the color ;) */
diff --git a/src/w32fns.c b/src/w32fns.c
index c43b7d4adf3..b8c445a3a36 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1528,11 +1528,8 @@ void
 x_set_cursor_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 {
   set_frame_cursor_types (f, arg);
-
-  /* Make sure the cursor gets redrawn.  */
-  cursor_type_changed = 1;
 }
-
+
 void
 x_set_icon_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 {
diff --git a/src/xdisp.c b/src/xdisp.c
index 42b7977687e..aecca138e04 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26250,6 +26250,9 @@ set_frame_cursor_types (struct frame *f, Lisp_Object arg)
     }
   else
     FRAME_BLINK_OFF_CURSOR (f) = DEFAULT_CURSOR;
+
+  /* Make sure the cursor gets redrawn.  */
+  cursor_type_changed = 1;
 }
 
 
diff --git a/src/xfns.c b/src/xfns.c
index 4f728ad59b0..0c91e298ec8 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1053,11 +1053,8 @@ static void
 x_set_cursor_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 {
   set_frame_cursor_types (f, arg);
-
-  /* Make sure the cursor gets redrawn.  */
-  cursor_type_changed = 1;
 }
-
+
 static void
 x_set_icon_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 {