[Emacs-diffs] trunk r113838: * nsfns.m (x_set_cursor_type):

[Dmitry Antipov]

------------------------------------------------------------
revno: 113838
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-13 12:58:15 +0400
message:
  * 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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsfns.m                    nsfns.m-20091113204419-o5vbwnq5f7feedwu-8741
  src/w32fns.c                   w32fns.c-20091113204419-o5vbwnq5f7feedwu-945
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
  src/xfns.c                     xfns.c-20091113204419-o5vbwnq5f7feedwu-274

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-13 08:39:14 +0000
+++ b/src/ChangeLog     2013-08-13 08:58:15 +0000
@@ -1,6 +1,10 @@
 2013-08-13  Dmitry Antipov  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2013-08-11 15:05:13 +0000
+++ b/src/nsfns.m       2013-08-13 08:58:15 +0000
@@ -860,11 +860,7 @@
 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 ;) */

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2013-08-09 12:25:34 +0000
+++ b/src/w32fns.c      2013-08-13 08:58:15 +0000
@@ -1528,11 +1528,8 @@
 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)
 {

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-08-12 09:34:00 +0000
+++ b/src/xdisp.c       2013-08-13 08:58:15 +0000
@@ -26003,6 +26003,9 @@
     }
   else
     FRAME_BLINK_OFF_CURSOR (f) = DEFAULT_CURSOR;
+
+  /* Make sure the cursor gets redrawn.  */
+  cursor_type_changed = 1;
 }
 
 

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2013-08-11 01:30:20 +0000
+++ b/src/xfns.c        2013-08-13 08:58:15 +0000
@@ -1053,11 +1053,8 @@
 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)
 {