Changeset 6560960 in mainline for uspace/app/edit/edit.c

Timestamp:

2012-08-20T22:46:13Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

077dad2

Parents:

971f50e7 (diff), dd13349 (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) (3 diffs)

uspace/app/edit/edit.c

@@ -111 +111 @@
 #define BUF_SIZE 64
 #define TAB_WIDTH 8
-#define ED_INFTY 65536
 
 /** Maximum filename length that can be entered. */
@@ -507 +506 @@
 static void key_handle_movement(unsigned int key, bool select)
 {
+        spt_t pt;
         switch (key) {
         case KC_LEFT:
@@ -521 +521 @@
                 break;
         case KC_HOME:
-                caret_move_relative(0, -ED_INFTY, dir_after, select);
+                tag_get_pt(&pane.caret_pos, &pt);
+                pt_get_sol(&pt, &pt);
+                caret_move(pt, select, true);
                 break;
         case KC_END:
-                caret_move_relative(0, +ED_INFTY, dir_before, select);
+                tag_get_pt(&pane.caret_pos, &pt);
+                pt_get_eol(&pt, &pt);
+                caret_move(pt, select, true);
                 break;
         case KC_PAGE_UP: