Changeset d7043b4

Timestamp:

Jul 11, 2009, 1:14:33 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

a0fbdee

Parents:

19f765d

git-author:

Karl Ramm <kcr@1ts.org> (06/08/09 10:45:55)

git-committer:

Nelson Elhage <nelhage@mit.edu> (07/11/09 13:14:33)

Message:

simplify line_move goal_column logic

File:

• editwin.c (modified) (1 diff)

editwin.c

@@ -791 +791 @@
 int owl_editwin_line_move(owl_editwin *e, int delta)
 {
-  int goal_column, change, ll, count = 0, distance = 0;
-
-  if (e->goal_column == -1) {
-    if (owl_editwin_at_beginning_of_line(e))
-      goal_column = 0;
-    else {
-      goal_column = -owl_editwin_move_if_not_in(e, -1, "\n");
-      if (!owl_editwin_at_beginning_of_buffer(e))
-        goal_column -= owl_editwin_point_move(e, 1);
-    }
-  } else
-    goal_column = e->goal_column;
+  int goal_column, change, ll, distance;
+  int count = 0;
 
   change = MAX(delta, -delta);
 
-  distance += owl_editwin_move_to_beginning_of_line(e);
+  goal_column = e->goal_column;
+  distance = owl_editwin_move_to_beginning_of_line(e);
+  goal_column = goal_column == -1 ? -distance : goal_column;
 
   while(count < change) {