Remove conditional compilation on NO_PROMPT_IN_BUFFER.

5 files changed, 3 insertions, 31 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 1b0b5ee988e..8aa19381983 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -369,9 +369,7 @@ The value is never nil.")
   b->newline_cache = 0;
   b->width_run_cache = 0;
   b->width_table = Qnil;
-#if !NO_PROMPT_IN_BUFFER
   b->minibuffer_prompt_length = Qnil;
-#endif
 
   /* Put this on the chain of all buffers including killed ones.  */
   b->next = all_buffers;
@@ -450,9 +448,7 @@ NAME should be a string which is not the name of an existing buffer.")
   b->newline_cache = 0;
   b->width_run_cache = 0;
   b->width_table = Qnil;
-#if !NO_PROMPT_IN_BUFFER
   b->minibuffer_prompt_length = Qnil;
-#endif
 
   /* Put this on the chain of all buffers including killed ones.  */
   b->next = all_buffers;
@@ -1221,9 +1217,7 @@ with SIGHUP.")
       b->width_run_cache = 0;
     }
   b->width_table = Qnil;
-#if !NO_PROMPT_IN_BUFFER
   b->minibuffer_prompt_length = Qnil;
-#endif
   UNBLOCK_INPUT;
   b->undo_list = Qnil;
 
diff --git a/src/buffer.h b/src/buffer.h
index 4928333cd43..99a1f60a296 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -488,11 +488,9 @@ struct buffer
     /* The name of this buffer.  */
     Lisp_Object name;
 
-#if !NO_PROMPT_IN_BUFFER
-    /* Amount at the start of the buffer used by a minibuffer prompt,
-       or nil if this buffer is not a mini-buffer.  */
+    /* Length in characters of the prompt in a mini-buffer, or nil if
+       this buffer is not a mini-buffer.  */
     Lisp_Object minibuffer_prompt_length;
-#endif
 
     /* The name of the file visited in this buffer, or nil.  */
     Lisp_Object filename;
diff --git a/src/cmds.c b/src/cmds.c
index 9c2f83dc054..64e7eaca4f2 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -163,7 +163,6 @@ If scan reaches end of buffer, stop there without error.")
   else
     CHECK_NUMBER (n, 0);
 
-#if !NO_PROMPT_IN_BUFFER
   {
     int pos = XFASTINT (Fline_beginning_position (n));
     if (INTEGERP (current_buffer->minibuffer_prompt_length)
@@ -171,9 +170,7 @@ If scan reaches end of buffer, stop there without error.")
       pos = XFASTINT (current_buffer->minibuffer_prompt_length);
     SET_PT (pos);
   }
-#else
-  SET_PT (XINT (Fline_beginning_position (n)));
-#endif
+  
   return Qnil;
 }
 
diff --git a/src/indent.c b/src/indent.c
index 18109acc2bc..699bae64bc1 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1654,21 +1654,6 @@ vmotion (from, vtarget, 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.
      Otherwise use the current buffer as arg for doing that.  */
   if (EQ (w->buffer, Fcurrent_buffer ()))
diff --git a/src/insdel.c b/src/insdel.c
index 0ea4924afc5..bbf0f7b036e 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -2052,14 +2052,12 @@ del_range_1 (from, to, prepare)
 {
   int from_byte, to_byte;
   
-#if !NO_PROMPT_IN_BUFFER
   if (INTEGERP (current_buffer->minibuffer_prompt_length))
     {
       /* Don't delete part of a mini-buffer prompt.  */
       int len = XFASTINT (current_buffer->minibuffer_prompt_length);
       from = max (from, len);
     }
-#endif /* !NO_PROMPT_IN_BUFFER */
 
   /* Make args be valid */
   if (from < BEGV)