From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 5 Mar 2011 23:52:45 +0000 (-0500)
Subject: * nsterm.m (ns_draw_window_cursor): Fix typo in 2011-02-23 commit.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~674^2~19
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=04cb68403d7a94e08a08821942cbc6da6494467a;p=emacs.git

* nsterm.m (ns_draw_window_cursor): Fix typo in 2011-02-23 commit.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e07b74a35ee..57a2b618d63 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-05  Chong Yidong  <cyd@stupidchicken.com>
+
+	* nsterm.m (ns_draw_window_cursor): Fix typo in 2011-02-23 commit.
+
 2011-03-02  Ken Brown  <kbrown@cornell.edu>
 
 	* sheap.c (STATIC_HEAP_SIZE): Increase to 13MB.
diff --git a/src/nsterm.m b/src/nsterm.m
index 4c47e65dc96..9237205a0f4 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -2283,8 +2283,7 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row,
   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;
     }