[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/minibuf.c
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/minibuf.c |
Date: |
Thu, 10 Apr 2003 22:06:15 -0400 |
Index: emacs/src/minibuf.c
diff -c emacs/src/minibuf.c:1.254 emacs/src/minibuf.c:1.255
*** emacs/src/minibuf.c:1.254 Fri Jan 24 14:15:05 2003
--- emacs/src/minibuf.c Thu Apr 10 22:06:15 2003
***************
*** 1719,1725 ****
if (NILP (completion))
{
bitch_at_user ();
! temp_echo_area_glyphs (" [No match]");
UNGCPRO;
return 0;
}
--- 1719,1725 ----
if (NILP (completion))
{
bitch_at_user ();
! temp_echo_area_glyphs (build_string (" [No match]"));
UNGCPRO;
return 0;
}
***************
*** 1783,1789 ****
else if (!NILP (Vcompletion_auto_help))
Fminibuffer_completion_help ();
else
! temp_echo_area_glyphs (" [Next char not unique]");
return 6;
}
else if (completedp)
--- 1783,1789 ----
else if (!NILP (Vcompletion_auto_help))
Fminibuffer_completion_help ();
else
! temp_echo_area_glyphs (build_string (" [Next char not unique]"));
return 6;
}
else if (completedp)
***************
*** 1882,1894 ****
case 1:
if (PT != ZV)
Fgoto_char (make_number (ZV));
! temp_echo_area_glyphs (" [Sole completion]");
break;
case 3:
if (PT != ZV)
Fgoto_char (make_number (ZV));
! temp_echo_area_glyphs (" [Complete, but not unique]");
break;
}
--- 1882,1894 ----
case 1:
if (PT != ZV)
Fgoto_char (make_number (ZV));
! temp_echo_area_glyphs (build_string (" [Sole completion]"));
break;
case 3:
if (PT != ZV)
Fgoto_char (make_number (ZV));
! temp_echo_area_glyphs (build_string (" [Complete, but not unique]"));
break;
}
***************
*** 1949,1955 ****
case 4:
if (!NILP (Vminibuffer_completion_confirm))
{
! temp_echo_area_glyphs (" [Confirm]");
return Qnil;
}
else
--- 1949,1955 ----
case 4:
if (!NILP (Vminibuffer_completion_confirm))
{
! temp_echo_area_glyphs (build_string (" [Confirm]"));
return Qnil;
}
else
***************
*** 1986,1992 ****
if (NILP (completion))
{
bitch_at_user ();
! temp_echo_area_glyphs (" [No match]");
return Qnil;
}
if (EQ (completion, Qt))
--- 1986,1992 ----
if (NILP (completion))
{
bitch_at_user ();
! temp_echo_area_glyphs (build_string (" [No match]"));
return Qnil;
}
if (EQ (completion, Qt))
***************
*** 2344,2350 ****
if (NILP (completions))
{
bitch_at_user ();
! temp_echo_area_glyphs (" [No completions]");
}
else
internal_with_output_to_temp_buffer ("*Completions*",
--- 2344,2350 ----
if (NILP (completions))
{
bitch_at_user ();
! temp_echo_area_glyphs (build_string (" [No completions]"));
}
else
internal_with_output_to_temp_buffer ("*Completions*",
***************
*** 2388,2402 ****
}
! /* 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
messages. */
void
! temp_echo_area_glyphs (m)
! const char *m;
{
int osize = ZV;
int osize_byte = ZV_BYTE;
--- 2388,2402 ----
}
! /* Temporarily display STRING 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
messages. */
void
! temp_echo_area_glyphs (string)
! Lisp_Object string;
{
int osize = ZV;
int osize_byte = ZV_BYTE;
***************
*** 2409,2415 ****
message (0);
SET_PT_BOTH (osize, osize_byte);
! insert_string (m);
SET_PT_BOTH (opoint, opoint_byte);
Vinhibit_quit = Qt;
Fsit_for (make_number (2), Qnil, Qnil);
--- 2409,2415 ----
message (0);
SET_PT_BOTH (osize, osize_byte);
! insert_from_string (string, 0, 0, SCHARS (string), SBYTES (string), 0);
SET_PT_BOTH (opoint, opoint_byte);
Vinhibit_quit = Qt;
Fsit_for (make_number (2), Qnil, Qnil);
***************
*** 2432,2438 ****
Lisp_Object string;
{
CHECK_STRING (string);
! temp_echo_area_glyphs (SDATA (string));
return Qnil;
}
--- 2432,2438 ----
Lisp_Object string;
{
CHECK_STRING (string);
! temp_echo_area_glyphs (string);
return Qnil;
}