* 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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 357bb9a37a82813e3ae6ac1a6f746dcdf0293b31..3de7ddcdb28997d554d3fb892429a450b168d28e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 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.

diff --git a/src/minibuf.c b/src/minibuf.c
index 4b709bd9cbdb44e13975d2daa19cbd7e354e651c..a56ed679a511a95543d6dac67c311664aa3d5bfd 100644 (file)
--- 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;
+
 \f
 /* 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 491ffa30bd1ca888edf67f56d3b5acb2ae6d3147..690fd9a50fa615c93b625af05efb688ff59bae58 100644 (file)
--- 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 4c1e906c04c5769693b3aef80d501cc505b673af..b95325c83975e822d7d73351638d6e7fd069ba83 100644 (file)
--- 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.  */