From e9588e2e96025e416921e24d08fc4822d2ce3c6b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 6 Mar 2011 01:52:06 -0800 Subject: [PATCH] * minibuf.c (minibuf_prompt, minibuf_prompt_width): Move here from xdisp.c, and make static, since these are used only here. * window.h, xdisp.c (minibuf_prompt, minibuf_prompt_width): Remove decls. --- src/ChangeLog | 5 +++++ src/minibuf.c | 9 +++++++++ src/window.h | 9 --------- src/xdisp.c | 9 --------- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 357bb9a37a8..3de7ddcdb28 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2011-03-06 Paul Eggert + * minibuf.c (minibuf_prompt, minibuf_prompt_width): Move here + from xdisp.c, and make static, since these are used only here. + * window.h, xdisp.c (minibuf_prompt, minibuf_prompt_width): + Remove decls. + * cmds.c (internal_self_insert): Reindent to match Emacs style. * xdisp.c: Rename or move local decls to avoid shadowing. diff --git a/src/minibuf.c b/src/minibuf.c index 4b709bd9cbd..a56ed679a51 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -82,6 +82,15 @@ Lisp_Object Qcase_fold_search; Lisp_Object Qread_expression_history; +/* Prompt to display in front of the mini-buffer contents. */ + +static Lisp_Object minibuf_prompt; + +/* Width of current mini-buffer prompt. Only set after display_line + of the line that contains the prompt. */ + +static int minibuf_prompt_width; + /* Put minibuf on currently selected frame's minibuffer. We do this whenever the user starts a new minibuffer diff --git a/src/window.h b/src/window.h index 491ffa30bd1..690fd9a50fa 100644 --- a/src/window.h +++ b/src/window.h @@ -788,14 +788,6 @@ void run_window_configuration_change_hook (struct frame *f); void set_window_buffer (Lisp_Object window, Lisp_Object buffer, int run_hooks_p, int keep_margins_p); -/* Prompt to display in front of the minibuffer contents. */ - -extern Lisp_Object minibuf_prompt; - -/* The visual width of the above. */ - -extern int minibuf_prompt_width; - /* This is the window where the echo area message was displayed. It is always a minibuffer window, but it may not be the same window currently active as a minibuffer. */ @@ -878,4 +870,3 @@ extern void keys_of_window (void); extern int window_box_text_cols (struct window *w); #endif /* not WINDOW_H_INCLUDED */ - diff --git a/src/xdisp.c b/src/xdisp.c index 4c1e906c04c..b95325c8397 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -483,15 +483,6 @@ int buffer_shared; static Lisp_Object default_invis_vector[3]; -/* Prompt to display in front of the mini-buffer contents. */ - -Lisp_Object minibuf_prompt; - -/* Width of current mini-buffer prompt. Only set after display_line - of the line that contains the prompt. */ - -int minibuf_prompt_width; - /* This is the window where the echo area message was displayed. It is always a mini-buffer window, but it may not be the same window currently active as a mini-buffer. */ -- 2.39.5