diff options
author | ridiculousfish <corydoras@ridiculousfish.com> | 2014-02-28 02:15:24 -0800 |
---|---|---|
committer | ridiculousfish <corydoras@ridiculousfish.com> | 2014-02-28 02:16:48 -0800 |
commit | be33d3f2a44ad16358b614c9f47fdb8094b4e127 (patch) | |
tree | 6f71351479ec06b1519e2ec5c26e220c1fdd0464 /common.cpp | |
parent | 858b6aa257c13451d0537b19c6f035fdb5114ee6 (diff) |
Revert "Merge pull request #1317 from pullreq/cpp"
This reverts commit 74135c0600d5dcc40d396d0e7293c17b8d4bdaa7, reversing
changes made to 6d749789ce240a3e6f1447777db63fd8e7525560.
See discussion in #1317
Diffstat (limited to 'common.cpp')
-rw-r--r-- | common.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/** \file common.cpp +/** \file common.c Various functions, mostly string utilities, that are used by most parts of fish. @@ -866,7 +866,11 @@ void write_screen(const wcstring &msg, wcstring &buff) /* If token is zero character long, we don't do anything */ - if (overflow) + if (pos == start) + { + start = pos = pos+1; + } + else if (overflow) { /* In case of overflow, we print a newline, except if we already are at position 0 |