[Emacs-diffs] /srv/bzr/emacs/trunk r103538: * nsterm.m (ns_draw_window_cursor): Fix typo in 2011-02-23 commit.

[Chong Yidong]

------------------------------------------------------------
revno: 103538
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-03-05 18:52:45 -0500
message:
  * nsterm.m (ns_draw_window_cursor): Fix typo in 2011-02-23 commit.
modified:
  src/ChangeLog
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-03-05 20:09:37 +0000
+++ b/src/ChangeLog     2011-03-05 23:52:45 +0000
@@ -1,3 +1,7 @@
+2011-03-05  Chong Yidong  <address@hidden>
+
+       * nsterm.m (ns_draw_window_cursor): Fix typo in 2011-02-23 commit.
+
 2011-03-02  Ken Brown  <address@hidden>
 
        * sheap.c (STATIC_HEAP_SIZE): Increase to 13MB.

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2011-03-03 08:03:01 +0000
+++ b/src/nsterm.m      2011-03-05 23:52:45 +0000
@@ -2283,8 +2283,7 @@
   if (cursor_type == BAR_CURSOR || cursor_type == HBAR_CURSOR)
     {
       if (cursor_width < 0)
-       cursor_width = FRAME_CURSOR_WIDTH (f);
-      cursor_width = min (cursor_width, 1);
+       cursor_width = max (FRAME_CURSOR_WIDTH (f), 1);
       w->phys_cursor_width = cursor_width;
     }