Commit 2da8bf64 authored by Gerd Moellmann's avatar Gerd Moellmann

(Fbuffer_string): Use prompt_end_charpos instead

of minibuffer_prompt_length.
(Fline_beginning_position): Ditto.
(make_buffer_string_both): Take out the code
to handle mini-buffer prompts.
(Fbuffer_string): Handle the prompt here, instead.
parent c99f6080
...@@ -301,10 +301,10 @@ the return value is never within the prompt either.") ...@@ -301,10 +301,10 @@ the return value is never within the prompt either.")
Fforward_line (make_number (XINT (n) - 1)); Fforward_line (make_number (XINT (n) - 1));
end = PT; end = PT;
if (INTEGERP (current_buffer->minibuffer_prompt_length) if (INTEGERP (current_buffer->prompt_end_charpos)
&& orig >= XFASTINT (current_buffer->minibuffer_prompt_length) && orig >= XFASTINT (current_buffer->prompt_end_charpos)
&& end < XFASTINT (current_buffer->minibuffer_prompt_length)) && end < XFASTINT (current_buffer->prompt_end_charpos))
end = XFASTINT (current_buffer->minibuffer_prompt_length); end = XFASTINT (current_buffer->prompt_end_charpos);
SET_PT_BOTH (orig, orig_byte); SET_PT_BOTH (orig, orig_byte);
...@@ -1622,13 +1622,6 @@ make_buffer_string_both (start, start_byte, end, end_byte, props) ...@@ -1622,13 +1622,6 @@ make_buffer_string_both (start, start_byte, end, end_byte, props)
{ {
Lisp_Object result, tem, tem1; Lisp_Object result, tem, tem1;
if (INTEGERP (current_buffer->minibuffer_prompt_length))
{
int len = XFASTINT (current_buffer->minibuffer_prompt_length);
start = min (end, max (len, start));
start_byte = CHAR_TO_BYTE (start);
}
if (start < GPT && GPT < end) if (start < GPT && GPT < end)
move_gap (start); move_gap (start);
...@@ -1729,10 +1722,19 @@ they can be in either order.") ...@@ -1729,10 +1722,19 @@ they can be in either order.")
DEFUN ("buffer-string", Fbuffer_string, Sbuffer_string, 0, 0, 0, DEFUN ("buffer-string", Fbuffer_string, Sbuffer_string, 0, 0, 0,
"Return the contents of the current buffer as a string.\n\ "Return the contents of the current buffer as a string.\n\
If narrowing is in effect, this function returns only the visible part\n\ If narrowing is in effect, this function returns only the visible part\n\
of the buffer.") of the buffer. If in a mini-buffer, don't include the prompt in the\n\
string returned.")
() ()
{ {
return make_buffer_string (BEGV, ZV, 1); int start = BEGV;
if (INTEGERP (current_buffer->prompt_end_charpos))
{
int len = XFASTINT (current_buffer->prompt_end_charpos);
start = min (ZV, max (len, start));
}
return make_buffer_string (start, ZV, 1);
} }
DEFUN ("insert-buffer-substring", Finsert_buffer_substring, Sinsert_buffer_substring, DEFUN ("insert-buffer-substring", Finsert_buffer_substring, Sinsert_buffer_substring,
......
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