emacs: src/minibuf.c comparison

comparison src/minibuf.c @ 25354:2049a0c919a1

Remove conditional compilation on NO_PROMPT_IN_BUFFER. (Fminibuffer_prompt_end): New. (syms_of_minibuf): Defsubr it. Remove minibuffer-prompt-in-buffer. (Fminibuffer_prompt_width): Return 0 if not in mini-buffer. Extend documentation. (read_minibuf): Use clear_message instead of setting echo_area_glyphs. (Fminibuffer_completion_help): Ditto.

author	Gerd Moellmann <gerd@gnu.org>
date	Sat, 21 Aug 1999 19:30:16 +0000
parents	1c522baf1a3c
children	e0cfeb5dc848

comparison

equal deleted inserted replaced

-:fa9f34ec4151
+:2049a0c919a1
 Lisp_Object Qminibuffer_default;
 Lisp_Object Qcurrent_input_method, Qactivate_input_method;
 extern Lisp_Object Qmouse_face;
-/* If the following variable is bound, mini-buffer prompts are
-inserted into mini-buffers instead of being displayed via
-display_string.  Tested in simple.el.  No other use.  */
-#if !NO_PROMPT_IN_BUFFER
-Lisp_Object  Vminibuffer_prompt_in_buffer;
-#endif
 /* Put minibuf on currently selected frame's minibuffer.
 We do this whenever the user starts a new minibuffer
 or when a minibuffer exits.  */
 Lisp_Object val;
 int count = specpdl_ptr - specpdl;
 Lisp_Object mini_frame, ambient_dir, minibuffer, input_method;
 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
 Lisp_Object enable_multibyte;
-#if !NO_PROMPT_IN_BUFFER
 extern Lisp_Object Qinvisible, Qintangible, Qread_only, Qfront_sticky;
-#endif
 specbind (Qminibuffer_default, defalt);
 single_kboard_state ();
 		    Fcons (Vhelp_form,
 			   Fcons (Vcurrent_prefix_arg,
 				  Fcons (Vminibuffer_history_position,
 					 Fcons (Vminibuffer_history_variable,
 						minibuf_save_list))))));
-#if !NO_PROMPT_IN_BUFFER
 minibuf_save_list
 = Fcons (current_buffer->minibuffer_prompt_length,
 	     minibuf_save_list);
-#endif
 record_unwind_protect (read_minibuf_unwind, Qnil);
 minibuf_level++;
 /* Now that we can restore all those variables, start changing them.  */
 Fselect_window (minibuf_window);
 XSETFASTINT (XWINDOW (minibuf_window)->hscroll, 0);
 Fmake_local_variable (Qprint_escape_newlines);
 print_escape_newlines = 1;
-#if !NO_PROMPT_IN_BUFFER
 XSETFASTINT (current_buffer->minibuffer_prompt_length, 0);
-#endif
 /* Erase the buffer.  */
 {
 int count1 = specpdl_ptr - specpdl;
 specbind (Qinhibit_read_only, Qt);
 if (!NILP (current_buffer->enable_multibyte_characters)
 && ! STRING_MULTIBYTE (minibuf_prompt))
 minibuf_prompt = Fstring_make_multibyte (minibuf_prompt);
-#if !NO_PROMPT_IN_BUFFER
 /* Insert the prompt, record where it ends.  */
 Finsert (1, &minibuf_prompt);
 XSETFASTINT (current_buffer->minibuffer_prompt_length, PT);
 if (PT > BEG)
 {
 Fput_text_property (make_number (BEG), make_number (PT - 1),
 			  Qread_only, Qt, Qnil);
 Fput_text_property (make_number (PT - 1), make_number (Z),
 			  Qrear_nonsticky, Qt, Qnil);
 }
-#endif
 /* If appropriate, copy enable-multibyte-characters into the minibuffer.  */
 if (inherit_input_method)
 current_buffer->enable_multibyte_characters = enable_multibyte;
 Finsert (1, &initial);
 if (INTEGERP (backup_n))
 	Fforward_char (backup_n);
 }
-echo_area_glyphs = 0;
+clear_message (1, 1);
-/* This is in case the minibuffer-setup-hook calls Fsit_for.  */
-previous_echo_glyphs = 0;
-echo_area_message = previous_echo_area_message = Qnil,
 current_buffer->keymap = map;
 /* Turn on an input method stored in INPUT_METHOD if any.  */
 if (STRINGP (input_method) && !NILP (Ffboundp (Qactivate_input_method)))
 call1 (Qactivate_input_method, input_method);
 /* 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.  */
-#if !NO_PROMPT_IN_BUFFER
 current_buffer->minibuffer_prompt_length = Fcar (minibuf_save_list);
 minibuf_save_list = Fcdr (minibuf_save_list);
-#endif
 minibuf_prompt = Fcar (minibuf_save_list);
 minibuf_save_list = Fcdr (minibuf_save_list);
 minibuf_prompt_width = XFASTINT (Fcar (minibuf_save_list));
 minibuf_save_list = Fcdr (minibuf_save_list);
 {
 register int i;
 Lisp_Object val;
 /* Allow user to specify null string */
-#if !NO_PROMPT_IN_BUFFER
 if (XFASTINT (current_buffer->minibuffer_prompt_length) == ZV)
-#else
-if (BEGV == ZV)
-#endif
 goto exit;
 if (!NILP (test_completion (Fbuffer_string ())))
 goto exit;
 }
 UNGCPRO;
 }
 #endif /* Rewritten code */
-#if !NO_PROMPT_IN_BUFFER
 {
 int prompt_end_charpos, prompt_end_bytepos;
 prompt_end_charpos = XFASTINT (current_buffer->minibuffer_prompt_length);
 prompt_end_bytepos = CHAR_TO_BYTE (prompt_end_charpos);
 i = ZV - prompt_end_charpos;
 i_byte = ZV_BYTE - prompt_end_bytepos;
 }
-#else
-i = ZV - BEGV;
-i_byte = ZV_BYTE - BEGV_BYTE;
-#endif
 /* If completion finds next char not unique,
 consider adding a space or a hyphen. */
 if (i == XSTRING (completion)->size)
 {
 }
 }
 /* If got no characters, print help for user.  */
-#if !NO_PROMPT_IN_BUFFER
 if (i == ZV - XFASTINT (current_buffer->minibuffer_prompt_length))
-#else
-if (i == ZV - BEGV)
-#endif
 {
 if (auto_help)
 	Fminibuffer_completion_help ();
 return Qnil;
 }
 message ("Making completion list...");
 completions = Fall_completions (Fbuffer_string (),
 				  Vminibuffer_completion_table,
 				  Vminibuffer_completion_predicate,
 				  Qt);
-echo_area_glyphs = 0;
+clear_message (1, 0);
-echo_area_message = Qnil;
 if (NILP (completions))
 {
 bitch_at_user ();
 temp_echo_area_glyphs (" [No completions]");
 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.")
+"Return the display width of the minibuffer prompt.\n\
+Return 0 if current buffer is not a mini-buffer.")
 ()
 {
 Lisp_Object width;
-#if !NO_PROMPT_IN_BUFFER
+if (NILP (current_buffer->minibuffer_prompt_length))
-XSETFASTINT (width, current_buffer->minibuffer_prompt_length);
+width = make_number (0);
-#else
+else
-XSETFASTINT (width, minibuf_prompt_width);
+width = make_number (current_buffer->minibuffer_prompt_length);
-#endif
 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)
+	  ? make_number (0)
+	  : make_number (current_buffer->minibuffer_prompt_length));
+}
 /* Temporarily display the string M at the end of the current
 minibuffer contents.  This is used to display things like
 "[No Match]" when the user requests a completion for a prefix
 that has no possible completions, and other quick, unobtrusive
 staticpro (&Qcurrent_input_method);
 Qactivate_input_method = intern ("activate-input-method");
 staticpro (&Qactivate_input_method);
-#if !NO_PROMPT_IN_BUFFER
-/* This variable should be removed once it has been decided whether or
-not to use prompts in buffers.  */
-DEFVAR_LISP ("minibuffer-prompt-in-buffer", &Vminibuffer_prompt_in_buffer,
-"The existance of this variable indicates that mini-buffer prompts are\n\
-inserted into the mini-buffer.");
-Vminibuffer_prompt_in_buffer = Qnil;
-#endif /* !NO_PROMPT_IN_BUFFER */
 DEFVAR_LISP ("read-buffer-function", &Vread_buffer_function,
 "If this is non-nil, `read-buffer' does its work by calling this function.");
 Vread_buffer_function = Qnil;
 DEFVAR_LISP ("minibuffer-setup-hook", &Vminibuffer_setup_hook,
 defsubr (&Sread_buffer);
 defsubr (&Sread_no_blanks_input);
 defsubr (&Sminibuffer_depth);
 defsubr (&Sminibuffer_prompt);
 defsubr (&Sminibuffer_prompt_width);
+defsubr (&Sminibuffer_prompt_end);
 defsubr (&Stry_completion);
 defsubr (&Sall_completions);
 defsubr (&Scompleting_read);
 defsubr (&Sminibuffer_complete);

Mercurial > emacs

comparison src/minibuf.c @ 25354:2049a0c919a1