Commit 9d815fd9 authored by Andreas Schwab's avatar Andreas Schwab
Browse files

(read_minibuf_unwind): Fix return type and return nil.

(temp_echo_area_glyphs): Define as returning nothing.
(init_minibuf_once): Likewise.
(syms_of_minibuf): Likewise.
(keys_of_minibuf): Likewise.
parent c0323249
...@@ -180,7 +180,7 @@ without invoking the usual minibuffer commands.") ...@@ -180,7 +180,7 @@ without invoking the usual minibuffer commands.")
/* Actual minibuffer invocation. */ /* Actual minibuffer invocation. */
static void read_minibuf_unwind (); static Lisp_Object read_minibuf_unwind ();
Lisp_Object get_minibuffer (); Lisp_Object get_minibuffer ();
static Lisp_Object read_minibuf (); static Lisp_Object read_minibuf ();
...@@ -525,7 +525,7 @@ get_minibuffer (depth) ...@@ -525,7 +525,7 @@ get_minibuffer (depth)
/* This function is called on exiting minibuffer, whether normally or not, /* This function is called on exiting minibuffer, whether normally or not,
and it restores the current window, buffer, etc. */ and it restores the current window, buffer, etc. */
static void static Lisp_Object
read_minibuf_unwind (data) read_minibuf_unwind (data)
Lisp_Object data; Lisp_Object data;
{ {
...@@ -584,6 +584,8 @@ read_minibuf_unwind (data) ...@@ -584,6 +584,8 @@ read_minibuf_unwind (data)
windows_or_buffers_changed++; windows_or_buffers_changed++;
XSETFASTINT (XWINDOW (window)->last_modified, 0); XSETFASTINT (XWINDOW (window)->last_modified, 0);
XSETFASTINT (XWINDOW (window)->last_overlay_modified, 0); XSETFASTINT (XWINDOW (window)->last_overlay_modified, 0);
return Qnil;
} }
...@@ -1881,6 +1883,7 @@ DEFUN ("minibuffer-prompt-width", Fminibuffer_prompt_width, ...@@ -1881,6 +1883,7 @@ DEFUN ("minibuffer-prompt-width", Fminibuffer_prompt_width,
that has no possible completions, and other quick, unobtrusive that has no possible completions, and other quick, unobtrusive
messages. */ messages. */
void
temp_echo_area_glyphs (m) temp_echo_area_glyphs (m)
char *m; char *m;
{ {
...@@ -1919,12 +1922,14 @@ or until the next input event arrives, whichever comes first.") ...@@ -1919,12 +1922,14 @@ or until the next input event arrives, whichever comes first.")
return Qnil; return Qnil;
} }
void
init_minibuf_once () init_minibuf_once ()
{ {
Vminibuffer_list = Qnil; Vminibuffer_list = Qnil;
staticpro (&Vminibuffer_list); staticpro (&Vminibuffer_list);
} }
void
syms_of_minibuf () syms_of_minibuf ()
{ {
minibuf_level = 0; minibuf_level = 0;
...@@ -2088,6 +2093,7 @@ with completion; they always discard text properties."); ...@@ -2088,6 +2093,7 @@ with completion; they always discard text properties.");
defsubr (&Sminibuffer_message); defsubr (&Sminibuffer_message);
} }
void
keys_of_minibuf () keys_of_minibuf ()
{ {
initial_define_key (Vminibuffer_local_map, Ctl ('g'), initial_define_key (Vminibuffer_local_map, Ctl ('g'),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment