Commit 4f5d0c3c authored by Jim Blandy's avatar Jim Blandy
Browse files

* cmds.c (Fforward_line): Call scan_buffer with new args.

(Fend_of_line): Replace call to Fforward_line and search loop with
call to find_before_next_newline.
parent 18e93755
......@@ -106,7 +106,7 @@ With positive ARG, a non-empty line at the end counts as one line\n\
}
negp = count <= 0;
pos = scan_buffer ('\n', pos2, count - negp, &shortage, 1);
pos = scan_buffer ('\n', pos2, 0, count - negp, &shortage, 1);
if (shortage > 0
&& (negp
|| (ZV > BEGV
......@@ -150,13 +150,7 @@ If scan reaches end of buffer, stop there without error.")
else
CHECK_NUMBER (n, 0);
if (XINT (n) != 1)
Fforward_line (make_number (XINT (n) - 1));
pos = point;
stop = ZV;
while (pos < stop && FETCH_CHAR (pos) != '\n') pos++;
SET_PT (pos);
SET_PT (find_before_next_newline (PT, 0, XINT (n) - (XINT (n) <= 0)));
return Qnil;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment