Mercurial > emacs
comparison src/minibuf.c @ 90614:8dd8c8286063
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 460-475)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 145-152)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-118
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 15 Oct 2006 02:54:13 +0000 |
parents | bb0e318b7c53 e876a1f62fec |
children | 7eeafaaa9eab |
comparison
equal
deleted
inserted
replaced
90613:7a2fdfcc7f71 | 90614:8dd8c8286063 |
---|---|
2681 minibuffer contents. This is used to display things like | 2681 minibuffer contents. This is used to display things like |
2682 "[No Match]" when the user requests a completion for a prefix | 2682 "[No Match]" when the user requests a completion for a prefix |
2683 that has no possible completions, and other quick, unobtrusive | 2683 that has no possible completions, and other quick, unobtrusive |
2684 messages. */ | 2684 messages. */ |
2685 | 2685 |
2686 extern Lisp_Object Vminibuffer_message_timeout; | |
2687 | |
2686 void | 2688 void |
2687 temp_echo_area_glyphs (string) | 2689 temp_echo_area_glyphs (string) |
2688 Lisp_Object string; | 2690 Lisp_Object string; |
2689 { | 2691 { |
2690 int osize = ZV; | 2692 int osize = ZV; |
2699 | 2701 |
2700 SET_PT_BOTH (osize, osize_byte); | 2702 SET_PT_BOTH (osize, osize_byte); |
2701 insert_from_string (string, 0, 0, SCHARS (string), SBYTES (string), 0); | 2703 insert_from_string (string, 0, 0, SCHARS (string), SBYTES (string), 0); |
2702 SET_PT_BOTH (opoint, opoint_byte); | 2704 SET_PT_BOTH (opoint, opoint_byte); |
2703 Vinhibit_quit = Qt; | 2705 Vinhibit_quit = Qt; |
2704 sit_for (make_number (2), 0, 2); | 2706 |
2707 if (NUMBERP (Vminibuffer_message_timeout)) | |
2708 sit_for (Vminibuffer_message_timeout, 0, 2); | |
2709 else | |
2710 sit_for (Qt, 0, 2); | |
2711 | |
2705 del_range_both (osize, osize_byte, ZV, ZV_BYTE, 1); | 2712 del_range_both (osize, osize_byte, ZV, ZV_BYTE, 1); |
2706 SET_PT_BOTH (opoint, opoint_byte); | 2713 SET_PT_BOTH (opoint, opoint_byte); |
2707 if (!NILP (Vquit_flag)) | 2714 if (!NILP (Vquit_flag)) |
2708 { | 2715 { |
2709 Vquit_flag = Qnil; | 2716 Vquit_flag = Qnil; |