Commit e9588e2e authored by Paul Eggert's avatar Paul Eggert
Browse files

* 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.
parent 1e12733b
2011-03-06 Paul Eggert <eggert@cs.ucla.edu>
 
* 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.
......@@ -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
......
......@@ -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 */
......@@ -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. */
......
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