Changeset 0b9ac3c in mainline for uspace/app/edit/edit.c

Timestamp:

2010-02-23T19:03:28Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/app/edit/edit.c (modified) (4 diffs)

uspace/app/edit/edit.c

@@ -718 +718 @@
         wchar_t c;
         size_t pos, size;
-        unsigned s_column;
+        int s_column;
         coord_t csel_start, csel_end, ctmp;
 
@@ -766 +766 @@
                 s_column = pane.sh_column;
                 while (pos < size) {
-                        if (csel_start.row == rbc.row && csel_start.column == s_column) {
+                        if ((csel_start.row == rbc.row) && (csel_start.column == s_column)) {
                                 fflush(stdout);
                                 console_set_color(con, COLOR_BLACK, COLOR_RED, 0);
@@ -772 +772 @@
                         }
         
-                        if (csel_end.row == rbc.row && csel_end.column == s_column) {
+                        if ((csel_end.row == rbc.row) && (csel_end.column == s_column)) {
                                 fflush(stdout);
                                 console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);
@@ -792 +792 @@
                 }
 
-                if (csel_end.row == rbc.row && csel_end.column == s_column) {
+                if ((csel_end.row == rbc.row) && (csel_end.column == s_column)) {
                         fflush(stdout);
                         console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);