Commit 4f13cc99 authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

Remove conditional compilation on NO_PROMPT_IN_BUFFER.

parent 32347cf4
...@@ -369,9 +369,7 @@ The value is never nil.") ...@@ -369,9 +369,7 @@ The value is never nil.")
b->newline_cache = 0; b->newline_cache = 0;
b->width_run_cache = 0; b->width_run_cache = 0;
b->width_table = Qnil; b->width_table = Qnil;
#if !NO_PROMPT_IN_BUFFER
b->minibuffer_prompt_length = Qnil; b->minibuffer_prompt_length = Qnil;
#endif
/* Put this on the chain of all buffers including killed ones. */ /* Put this on the chain of all buffers including killed ones. */
b->next = all_buffers; b->next = all_buffers;
...@@ -450,9 +448,7 @@ NAME should be a string which is not the name of an existing buffer.") ...@@ -450,9 +448,7 @@ NAME should be a string which is not the name of an existing buffer.")
b->newline_cache = 0; b->newline_cache = 0;
b->width_run_cache = 0; b->width_run_cache = 0;
b->width_table = Qnil; b->width_table = Qnil;
#if !NO_PROMPT_IN_BUFFER
b->minibuffer_prompt_length = Qnil; b->minibuffer_prompt_length = Qnil;
#endif
/* Put this on the chain of all buffers including killed ones. */ /* Put this on the chain of all buffers including killed ones. */
b->next = all_buffers; b->next = all_buffers;
...@@ -1221,9 +1217,7 @@ with SIGHUP.") ...@@ -1221,9 +1217,7 @@ with SIGHUP.")
b->width_run_cache = 0; b->width_run_cache = 0;
} }
b->width_table = Qnil; b->width_table = Qnil;
#if !NO_PROMPT_IN_BUFFER
b->minibuffer_prompt_length = Qnil; b->minibuffer_prompt_length = Qnil;
#endif
UNBLOCK_INPUT; UNBLOCK_INPUT;
b->undo_list = Qnil; b->undo_list = Qnil;
......
...@@ -488,11 +488,9 @@ struct buffer ...@@ -488,11 +488,9 @@ struct buffer
/* The name of this buffer. */ /* The name of this buffer. */
Lisp_Object name; Lisp_Object name;
#if !NO_PROMPT_IN_BUFFER /* Length in characters of the prompt in a mini-buffer, or nil if
/* Amount at the start of the buffer used by a minibuffer prompt, this buffer is not a mini-buffer. */
or nil if this buffer is not a mini-buffer. */
Lisp_Object minibuffer_prompt_length; Lisp_Object minibuffer_prompt_length;
#endif
/* The name of the file visited in this buffer, or nil. */ /* The name of the file visited in this buffer, or nil. */
Lisp_Object filename; Lisp_Object filename;
......
...@@ -163,7 +163,6 @@ If scan reaches end of buffer, stop there without error.") ...@@ -163,7 +163,6 @@ If scan reaches end of buffer, stop there without error.")
else else
CHECK_NUMBER (n, 0); CHECK_NUMBER (n, 0);
#if !NO_PROMPT_IN_BUFFER
{ {
int pos = XFASTINT (Fline_beginning_position (n)); int pos = XFASTINT (Fline_beginning_position (n));
if (INTEGERP (current_buffer->minibuffer_prompt_length) if (INTEGERP (current_buffer->minibuffer_prompt_length)
...@@ -171,9 +170,7 @@ If scan reaches end of buffer, stop there without error.") ...@@ -171,9 +170,7 @@ If scan reaches end of buffer, stop there without error.")
pos = XFASTINT (current_buffer->minibuffer_prompt_length); pos = XFASTINT (current_buffer->minibuffer_prompt_length);
SET_PT (pos); SET_PT (pos);
} }
#else
SET_PT (XINT (Fline_beginning_position (n)));
#endif
return Qnil; return Qnil;
} }
......
...@@ -1654,21 +1654,6 @@ vmotion (from, vtarget, w) ...@@ -1654,21 +1654,6 @@ vmotion (from, vtarget, w)
XSETWINDOW (window, w); XSETWINDOW (window, w);
#if NO_PROMPT_IN_BUFFER
/* The omission of the clause
&& marker_position (w->start) == BEG
here is deliberate; I think we want to measure from the prompt
position even if the minibuffer window has scrolled. */
if (EQ (window, minibuf_window))
{
if (minibuf_prompt_width == 0 && STRINGP (minibuf_prompt))
minibuf_prompt_width
= string_display_width (minibuf_prompt, Qnil, Qnil);
start_hpos = minibuf_prompt_width;
}
#endif /* NO_PROMPT_IN_BUFFER */
/* If the window contains this buffer, use it for getting text properties. /* If the window contains this buffer, use it for getting text properties.
Otherwise use the current buffer as arg for doing that. */ Otherwise use the current buffer as arg for doing that. */
if (EQ (w->buffer, Fcurrent_buffer ())) if (EQ (w->buffer, Fcurrent_buffer ()))
......
...@@ -2052,14 +2052,12 @@ del_range_1 (from, to, prepare) ...@@ -2052,14 +2052,12 @@ del_range_1 (from, to, prepare)
{ {
int from_byte, to_byte; int from_byte, to_byte;
#if !NO_PROMPT_IN_BUFFER
if (INTEGERP (current_buffer->minibuffer_prompt_length)) if (INTEGERP (current_buffer->minibuffer_prompt_length))
{ {
/* Don't delete part of a mini-buffer prompt. */ /* Don't delete part of a mini-buffer prompt. */
int len = XFASTINT (current_buffer->minibuffer_prompt_length); int len = XFASTINT (current_buffer->minibuffer_prompt_length);
from = max (from, len); from = max (from, len);
} }
#endif /* !NO_PROMPT_IN_BUFFER */
/* Make args be valid */ /* Make args be valid */
if (from < BEGV) if (from < BEGV)
......
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