Mercurial > hg > xemacs-beta

comparison src/minibuf.c @ 2286:04bc9d2f42c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-09-20 19:18:55 by james] Mark all unused parameters as unused. Also eliminate some unneeded local variables.
author james
date Mon, 20 Sep 2004 19:20:08 +0000
parents 61855263cb07
children ecf1ebac70d8
comparison
equal deleted inserted replaced
2285:914c5afaac33 2286:04bc9d2f42c7
144 144
145 /* We used to record the specpdl_depth here, but since call_command_loop 145 /* We used to record the specpdl_depth here, but since call_command_loop
146 never returns, we can never call unbind_to_1. Since we exit via a throw, 146 never returns, we can never call unbind_to_1. Since we exit via a throw,
147 we let whoever catches unbind for us. */ 147 we let whoever catches unbind for us. */
148 148
149 Lisp_Object val;
150
151 CHECK_STRING (prompt); 149 CHECK_STRING (prompt);
152 150
153 single_console_state (); 151 single_console_state ();
154 152
155 record_unwind_protect (read_minibuffer_internal_unwind, 153 record_unwind_protect (read_minibuffer_internal_unwind,
189 run_hook (Qminibuffer_setup_hook); 187 run_hook (Qminibuffer_setup_hook);
190 188
191 minibuf_level++; 189 minibuf_level++;
192 clear_echo_area (selected_frame (), Qnil, 0); 190 clear_echo_area (selected_frame (), Qnil, 0);
193 191
194 val = call_command_loop (Qt); 192 call_command_loop (Qt);
195 193
196 RETURN_NOT_REACHED (val); 194 RETURN_NOT_REACHED (Qnil);
197 } 195 }
198 196
199 197
200 198
201 /* Completion hair */ 199 /* Completion hair */
774 clear_echo_area (f, label, 1); 772 clear_echo_area (f, label, 1);
775 echo_area_append (f, nonreloc, reloc, offset, length, label); 773 echo_area_append (f, nonreloc, reloc, offset, length, label);
776 } 774 }
777 775
778 int 776 int
779 echo_area_active (struct frame *f) 777 echo_area_active (struct frame *UNUSED (f))
780 { 778 {
781 /* By definition, the echo area is active if the echo-area buffer 779 /* By definition, the echo area is active if the echo-area buffer
782 is not empty. No need to call Lisp code. (Anyway, this function 780 is not empty. No need to call Lisp code. (Anyway, this function
783 is called from redisplay.) */ 781 is called from redisplay.) */
784 struct buffer *echo_buffer = XBUFFER (Vecho_area_buffer); 782 struct buffer *echo_buffer = XBUFFER (Vecho_area_buffer);
798 else 796 else
799 return stdout_needs_newline ? Qmessage : Qnil; 797 return stdout_needs_newline ? Qmessage : Qnil;
800 } 798 }
801 799
802 Lisp_Object 800 Lisp_Object
803 echo_area_contents (struct frame *f) 801 echo_area_contents (struct frame *UNUSED (f))
804 { 802 {
805 /* See above. By definition, the contents of the echo-area buffer 803 /* See above. By definition, the contents of the echo-area buffer
806 are the contents of the echo area. */ 804 are the contents of the echo area. */
807 return Fbuffer_substring (Qnil, Qnil, Vecho_area_buffer); 805 return Fbuffer_substring (Qnil, Qnil, Vecho_area_buffer);
808 } 806 }