aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2008-04-09 18:02:08 +0000
committerStefan Monnier2008-04-09 18:02:08 +0000
commitc025fb0a25dc97d04f37b6f94ec85bcdaa6d4afa (patch)
tree84133e559ec86aafe36ff24456f10cb130ebc6e5 /src
parented7dabb3365b8474e4377529c72470d1476d6491 (diff)
downloademacs-c025fb0a25dc97d04f37b6f94ec85bcdaa6d4afa.tar.gz
emacs-c025fb0a25dc97d04f37b6f94ec85bcdaa6d4afa.zip
(temp_echo_area_glyphs): Remove unused function.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/minibuf.c42
2 files changed, 4 insertions, 42 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fc7b1404a41..893af47ccc7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12008-04-09 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * minibuf.c (temp_echo_area_glyphs): Remove unused function.
4
12008-04-09 Juanma Barranquero <lekktu@gmail.com> 52008-04-09 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * editfns.c (Ffield_string_no_properties): Fix typo in docstring. 7 * editfns.c (Ffield_string_no_properties): Fix typo in docstring.
diff --git a/src/minibuf.c b/src/minibuf.c
index ee6089a244c..8cdea645d34 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -2024,48 +2024,6 @@ If no minibuffer is active, return nil. */)
2024} 2024}
2025 2025
2026 2026
2027/* Temporarily display STRING at the end of the current
2028 minibuffer contents. This is used to display things like
2029 "[No Match]" when the user requests a completion for a prefix
2030 that has no possible completions, and other quick, unobtrusive
2031 messages. */
2032
2033extern Lisp_Object Vminibuffer_message_timeout;
2034
2035void
2036temp_echo_area_glyphs (string)
2037 Lisp_Object string;
2038{
2039 int osize = ZV;
2040 int osize_byte = ZV_BYTE;
2041 int opoint = PT;
2042 int opoint_byte = PT_BYTE;
2043 Lisp_Object oinhibit;
2044 oinhibit = Vinhibit_quit;
2045
2046 /* Clear out any old echo-area message to make way for our new thing. */
2047 message (0);
2048
2049 SET_PT_BOTH (osize, osize_byte);
2050 insert_from_string (string, 0, 0, SCHARS (string), SBYTES (string), 0);
2051 SET_PT_BOTH (opoint, opoint_byte);
2052 Vinhibit_quit = Qt;
2053
2054 if (NUMBERP (Vminibuffer_message_timeout))
2055 sit_for (Vminibuffer_message_timeout, 0, 2);
2056 else
2057 sit_for (Qt, 0, 2);
2058
2059 del_range_both (osize, osize_byte, ZV, ZV_BYTE, 1);
2060 SET_PT_BOTH (opoint, opoint_byte);
2061 if (!NILP (Vquit_flag))
2062 {
2063 Vquit_flag = Qnil;
2064 Vunread_command_events = Fcons (make_number (quit_char), Qnil);
2065 }
2066 Vinhibit_quit = oinhibit;
2067}
2068
2069void 2027void
2070init_minibuf_once () 2028init_minibuf_once ()
2071{ 2029{