emacs: src/minibuf.c comparison

comparison src/minibuf.c @ 25658:a9f38bb7f815

(read_minibuf_unwind): Call resize_mini_window with new parameter. (read_minibuf): Use prompt_end_charpos instead of minibuffer_prompt_length. (read_minibuf_unwind): Ditto. (Fminibuffer_complete_and_exit): Ditto. (Fminibuffer_complete_word): Ditto. (Fminibuffer_prompt_end): Ditto. (read_minibuf): Return mini-buffer contents without the prompt. (read_minibuf): Set minibuf_prompt_width to the current column after inserting prompt. (Fminibuffer_prompt_width): Return minibuf_prompt_width.

author	Gerd Moellmann <gerd@gnu.org>
date	Sun, 12 Sep 1999 20:21:55 +0000
parents	7f8ebd701925
children	b8bc6e792b2f

comparison

equal deleted inserted replaced

-:2e9b26a83bfa
+:a9f38bb7f815
 			   Fcons (Vcurrent_prefix_arg,
 				  Fcons (Vminibuffer_history_position,
 					 Fcons (Vminibuffer_history_variable,
 						minibuf_save_list))))));
 minibuf_save_list
-= Fcons (current_buffer->minibuffer_prompt_length,
+= Fcons (current_buffer->prompt_end_charpos,
 	     minibuf_save_list);
 record_unwind_protect (read_minibuf_unwind, Qnil);
 minibuf_level++;
 /* Now that we can restore all those variables, start changing them.  */
-minibuf_prompt_width = 0;	/* xdisp.c puts in the right value.  */
+minibuf_prompt_width = 0;
 minibuf_prompt = Fcopy_sequence (prompt);
 Vminibuffer_history_position = histpos;
 Vminibuffer_history_variable = histvar;
 Vhelp_form = Vminibuffer_help_form;
 Fselect_window (minibuf_window);
 XSETFASTINT (XWINDOW (minibuf_window)->hscroll, 0);
 Fmake_local_variable (Qprint_escape_newlines);
 print_escape_newlines = 1;
-XSETFASTINT (current_buffer->minibuffer_prompt_length, 0);
+XSETFASTINT (current_buffer->prompt_end_charpos, 0);
 /* Erase the buffer.  */
 {
 int count1 = specpdl_ptr - specpdl;
 specbind (Qinhibit_read_only, Qt);
 && ! STRING_MULTIBYTE (minibuf_prompt))
 minibuf_prompt = Fstring_make_multibyte (minibuf_prompt);
 /* Insert the prompt, record where it ends.  */
 Finsert (1, &minibuf_prompt);
-XSETFASTINT (current_buffer->minibuffer_prompt_length, PT);
+XSETFASTINT (current_buffer->prompt_end_charpos, PT);
 if (PT > BEG)
 {
 Fput_text_property (make_number (BEG), make_number (PT),
 			  Qfront_sticky, Qt, Qnil);
 Fput_text_property (make_number (BEG), make_number (PT),
 			  Qrear_nonsticky, Qt, Qnil);
 Fput_text_property (make_number (BEG), make_number (PT),
 			  Qread_only, Qt, Qnil);
 }
+minibuf_prompt_width = current_column ();
 /* If appropriate, copy enable-multibyte-characters into the minibuffer.  */
 if (inherit_input_method)
 current_buffer->enable_multibyte_characters = enable_multibyte;
 	rif->flush_display (XFRAME (XWINDOW (minibuf_window)->frame));
 }
 /* Make minibuffer contents into a string.  */
 Fset_buffer (minibuffer);
-val = make_buffer_string (1, Z, allow_props);
+val = make_buffer_string (current_buffer->prompt_end_charpos,
+			    Z, allow_props);
 /* VAL is the string of minibuffer text.  */
 last_minibuf_string = val;
 /* To keep things predictable, in case it matters, let's be in the
 minibuffer when we reset the relevant variables.  */
 Fset_buffer (XWINDOW (window)->buffer);
 /* Restore prompt, etc, from outer minibuffer level.  */
-current_buffer->minibuffer_prompt_length = Fcar (minibuf_save_list);
+current_buffer->prompt_end_charpos = Fcar (minibuf_save_list);
 minibuf_save_list = Fcdr (minibuf_save_list);
 minibuf_prompt = Fcar (minibuf_save_list);
 minibuf_save_list = Fcdr (minibuf_save_list);
 minibuf_prompt_width = XFASTINT (Fcar (minibuf_save_list));
 }
 /* When we get to the outmost level, make sure we resize the
 mini-window back to its normal size.  */
 if (minibuf_level == 0)
-resize_mini_window (XWINDOW (window));
+resize_mini_window (XWINDOW (window), 0);
 /* Make sure minibuffer window is erased, not ignored.  */
 windows_or_buffers_changed++;
 XSETFASTINT (XWINDOW (window)->last_modified, 0);
 XSETFASTINT (XWINDOW (window)->last_overlay_modified, 0);
 {
 register int i;
 Lisp_Object val;
 /* Allow user to specify null string */
-if (XFASTINT (current_buffer->minibuffer_prompt_length) == ZV)
+if (XFASTINT (current_buffer->prompt_end_charpos) == ZV)
 goto exit;
 if (!NILP (test_completion (Fbuffer_string ())))
 goto exit;
 }
 #endif /* Rewritten code */
 {
 int prompt_end_charpos, prompt_end_bytepos;
-prompt_end_charpos = XFASTINT (current_buffer->minibuffer_prompt_length);
+prompt_end_charpos = XFASTINT (current_buffer->prompt_end_charpos);
 prompt_end_bytepos = CHAR_TO_BYTE (prompt_end_charpos);
 i = ZV - prompt_end_charpos;
 i_byte = ZV_BYTE - prompt_end_bytepos;
 }
 }
 }
 /* If got no characters, print help for user.  */
-if (i == ZV - XFASTINT (current_buffer->minibuffer_prompt_length))
+if (i == ZV - XFASTINT (current_buffer->prompt_end_charpos))
 {
 if (auto_help)
 	Fminibuffer_completion_help ();
 return Qnil;
 }
 return Fcopy_sequence (minibuf_prompt);
 }
 DEFUN ("minibuffer-prompt-width", Fminibuffer_prompt_width,
 Sminibuffer_prompt_width, 0, 0, 0,
-"Return the display width of the minibuffer prompt.\n\
+"Return the display width of the minibuffer prompt.")
-Return 0 if current buffer is not a mini-buffer.")
 ()
 {
-Lisp_Object width;
+return make_number (minibuf_prompt_width);
-if (NILP (current_buffer->minibuffer_prompt_length))
-width = make_number (0);
-else
-width = make_number (current_buffer->minibuffer_prompt_length);
-return width;
 }
 DEFUN ("minibuffer-prompt-end", Fminibuffer_prompt_end,
 Sminibuffer_prompt_end, 0, 0, 0,
 "Return the end buffer position of the mini-buffer prompt.\n\
 Value is 0 if current buffer is not a mini-buffer.")
 ()
 {
-return (NILP (current_buffer->minibuffer_prompt_length)
+return (NILP (current_buffer->prompt_end_charpos)
 	  ? make_number (0)
-	  : make_number (current_buffer->minibuffer_prompt_length));
+	  : make_number (current_buffer->prompt_end_charpos));
 }
 /* Temporarily display the string M at the end of the current

Mercurial > emacs

comparison src/minibuf.c @ 25658:a9f38bb7f815