Changeset d625cfd

Timestamp:

May 3, 2010, 9:09:14 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

a4bbd80

Parents:

7149832

git-author:

Nelson Elhage <nelhage@mit.edu> (05/01/10 11:51:50)

git-committer:

Nelson Elhage <nelhage@mit.edu> (05/03/10 21:09:14)

Message:

Allow disabling of both automatic wrapping and filling.

In addition, don't force wrapping at the window width unless the user
specifically asked for it.

File:

• editwin.c (modified) (4 diffs)

editwin.c

@@ -49 +49 @@
 static int oe_find_display_line(owl_editwin *e, int *x, int index, int *hard);
 static void oe_insert_char(owl_editwin *e, gunichar c);
-static int owl_editwin_limit_maxcols(int v, int maxv);
+static int owl_editwin_limit_maxcols(int width, int cols);
 static int owl_editwin_check_dotsend(owl_editwin *e);
 static int owl_editwin_is_char_in(owl_editwin *e, const char *set);
@@ -218 +218 @@
 }
 
-static int owl_editwin_limit_maxcols(int v, int maxv)
-{
-  /* maxv > 5 ? MAX(v, vax) : v */
-  if (maxv > 5 && v > maxv) {
-    return(maxv);
-  } else {
-    return(v);
-  }
+static int owl_editwin_limit_maxcols(int width, int cols)
+{
+  if (cols == 0)
+    return width;
+  return cols;
 }
 
@@ -1101 +1098 @@
   int sentence;
 
+  if (e->fillcol < 0)
+    /* auto-fill disabled */
+    return;
+
   oe_save_excursion(e, &x);
 
@@ -1237 +1238 @@
     }
 
-    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