Changeset 80ed757

Timestamp:

May 8, 2010, 10:19:56 AM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

release-1.6

Children:

161e879

Parents:

937ac795

git-author:

Nelson Elhage <nelhage@mit.edu> (05/03/10 20:56:02)

git-committer:

Nelson Elhage <nelhage@mit.edu> (05/08/10 10:19:56)

Message:

Always disable wrapping in single-line editwins.

I also backported a hunk of d625cfd839f0b56d75199e576c0d3cab29a103b2for 1.6

File:

• editwin.c (modified) (4 diffs)

editwin.c

@@ -125 +125 @@
   e->topindex = 0;
   e->excursions = NULL;
-  owl_editwin_set_curswin(e, win, winlines, wincols);
   e->style=style;
   if ((style!=OWL_EDITWIN_STYLE_MULTILINE) &&
@@ -131 +130 @@
     e->style=OWL_EDITWIN_STYLE_MULTILINE;
   }
+  owl_editwin_set_curswin(e, win, winlines, wincols);
   e->lock=0;
   e->dotsend=0;
@@ -152 +152 @@
   e->wincols=wincols;
   e->fillcol=owl_editwin_limit_maxcols(wincols-7, owl_global_get_edit_maxfillcols(&g));
-  e->wrapcol=owl_editwin_limit_maxcols(wincols-7, owl_global_get_edit_maxwrapcols(&g));
+  if (e->style == OWL_EDITWIN_STYLE_MULTILINE)
+    e->wrapcol=owl_editwin_limit_maxcols(wincols-7, owl_global_get_edit_maxwrapcols(&g));
+  else
+    e->wrapcol = 0;
 }
 
@@ -1232 +1235 @@
     }
 
-    if (e->cursorx != -1 && e->cursorx + oe_char_width(c, e->cursorx) > e->wrapcol) {
+    if (e->wrapcol > 0 && e->cursorx != -1 &&
+        e->cursorx + oe_char_width(c, e->cursorx) > e->wrapcol) {
       /* XXX this is actually wrong:
        * + If the line has been been wrapped, we can be past the wrap column but