(minibuf_selected_window): Renamed from Vminibuf_selected_window.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5c9db9371fb4e2f74a07f6f94c788b72f4141889..22b6a3bea7285c7d072709be44f79fd9993424a0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-28  Kim F. Storm  <storm@cua.dk>
+
+       * window.c: (minibuf_selected_window): Renamed from
+       Vminibuf_selected_window.  Users changed.
+       (syms_of_window): Staticpro it.
+
 2002-02-26  Kim F. Storm  <storm@cua.dk>
 
        The following changes add a new Vminibuf_selected_window variable

diff --git a/src/dispextern.h b/src/dispextern.h
index 5d24a06ded0937dd2adba296c6c5251d913e8619..7777e56f98e9e915fe4a364502bab5a2b5c21406 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -931,15 +931,15 @@ extern struct glyph_row scratch_glyph_row;
    selected_window, this macro needs three arguments: SELW which is
    compared against the current value of selected_window, MBW which is
    compared against minibuf_window (if SELW doesn't match), and SCRW
-   which is compared against Vminibuf_selected_window (if MBW matches).  */
+   which is compared against minibuf_selected_window (if MBW matches).  */
 
 #define CURRENT_MODE_LINE_FACE_ID_3(SELW, MBW, SCRW)           \
      ((!mode_line_in_non_selected_windows                      \
        || (SELW) == XWINDOW (selected_window)                  \
        || (minibuf_level > 0                                   \
-           && !NILP (Vminibuf_selected_window)                 \
+           && !NILP (minibuf_selected_window)                  \
            && (MBW) == XWINDOW (minibuf_window)                        \
-           && (SCRW) == XWINDOW (Vminibuf_selected_window)))   \
+           && (SCRW) == XWINDOW (minibuf_selected_window)))    \
       ? MODE_LINE_FACE_ID                                      \
       : MODE_LINE_INACTIVE_FACE_ID)
 

diff --git a/src/minibuf.c b/src/minibuf.c
index cb3a25691ada38ff3532b74d7f82c3fb6be4a964..103020b169340df9ea840e94805da00328662046 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -547,7 +547,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
 
   Vminibuf_scroll_window = selected_window;
   if (minibuf_level == 1 || !EQ (minibuf_window, selected_window))
-    Vminibuf_selected_window = selected_window;
+    minibuf_selected_window = selected_window;
   Fset_window_buffer (minibuf_window, Fcurrent_buffer ());
   Fselect_window (minibuf_window);
   XSETFASTINT (XWINDOW (minibuf_window)->hscroll, 0);

diff --git a/src/window.h b/src/window.h
index d4a537bbe43b999c3cba21638d922e7daaefc24b..aa27858c8698eb27d045d36ecd1dfb5b2b769129 100644 (file)
--- a/src/window.h
+++ b/src/window.h
@@ -341,7 +341,7 @@ extern Lisp_Object minibuf_window;
 /* Non-nil means it is the window whose mode line should be
    shown as the selected window when the minibuffer is selected.  */
 
-extern Lisp_Object Vminibuf_selected_window;
+extern Lisp_Object minibuf_selected_window;
 
 /* Non-nil => window to for C-M-v to scroll when the minibuffer is
    selected.  */

diff --git a/src/xdisp.c b/src/xdisp.c
index d06e5e1aecfafa9268d38be3c3241c6246d290ac..e51f68ac7daa0415ce54c3eda9556f63a6aab1f5 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1582,8 +1582,8 @@ init_iterator (it, w, charpos, bytepos, row, base_face_id)
          /* Or show the region if we are in the mini-buffer and W is
             the window the mini-buffer refers to.  */
          || (MINI_WINDOW_P (XWINDOW (selected_window))
-             && WINDOWP (Vminibuf_selected_window)
-             && w == XWINDOW (Vminibuf_selected_window))))
+             && WINDOWP (minibuf_selected_window)
+             && w == XWINDOW (minibuf_selected_window))))
     {
       int charpos = marker_position (current_buffer->mark);
       it->region_beg_charpos = min (PT, charpos);