Changeset dd6af02 for fmtext.c


Ignore:
Timestamp:
Sep 28, 2009, 12:56:20 PM (12 years ago)
Author:
Alejandro R. Sedeño <asedeno@mit.edu>
Branches:
master, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
Children:
fb2f9ab
Parents:
7b4d90e
Message:
Revert 7b4d90e... and just fix #51

owl_fmtext_truncate_cols once again expects that fmtext ends in a
newline.

Revert documentation changes and remove test that now breaks while
testing out-of-spec text.

In owl_viewwin_init_fmtext, check that fmtext ends in a newline and
append one if necessary.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • fmtext.c

    r7b4d90e rdd6af02  
    418418/* Truncate the message so that each line begins at column 'acol' and
    419419 * ends at 'bcol' or sooner.  The first column is number 0.  The new
    420  * message is placed in 'out'.
     420 * message is placed in 'out'.  The message is expected to end in a
     421 * new line for now.
    421422 *
    422423 * NOTE: This needs to be modified to deal with backing up if we find
     
    442443    ptr_e=strchr(ptr_s, '\n');
    443444    if (!ptr_e) {
    444       /* set it to the NULL at the end of the string, to handle a line that is
    445        * not newline-terminated */
    446       ptr_e = last+1;
     445      /* but this shouldn't happen if we end in a \n */
     446      break;
    447447    }
    448448   
     
    499499      owl_fmtext_append_normal(out, "\n");
    500500    }
    501     /* Be careful if ptr_e is pointing to the NULL if we do not end with a
    502      * newline. We don't really need this check, but pointing ptr_s past the
    503      * NULL byte is just asking for problems later.
    504      */
    505     ptr_s = (ptr_e <= last) ? g_utf8_next_char(ptr_e) : ptr_e;
     501    ptr_s = g_utf8_next_char(ptr_e);
    506502  }
    507503}
Note: See TracChangeset for help on using the changeset viewer.