Mercurial > emacs
changeset 43595:b7964dae2379
(minibuf_selected_window): Renamed from Vminibuf_selected_window.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Thu, 28 Feb 2002 22:09:53 +0000 |
| parents | 23cddac4d0b7 |
| children | 078c962a35f1 |
| files | src/dispextern.h src/minibuf.c src/window.h src/xdisp.c |
| diffstat | 4 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dispextern.h Thu Feb 28 22:07:45 2002 +0000 +++ b/src/dispextern.h Thu Feb 28 22:09:53 2002 +0000 @@ -931,15 +931,15 @@ 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)
--- a/src/minibuf.c Thu Feb 28 22:07:45 2002 +0000 +++ b/src/minibuf.c Thu Feb 28 22:09:53 2002 +0000 @@ -547,7 +547,7 @@ 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);
--- a/src/window.h Thu Feb 28 22:07:45 2002 +0000 +++ b/src/window.h Thu Feb 28 22:09:53 2002 +0000 @@ -341,7 +341,7 @@ /* 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. */
--- a/src/xdisp.c Thu Feb 28 22:07:45 2002 +0000 +++ b/src/xdisp.c Thu Feb 28 22:09:53 2002 +0000 @@ -1582,8 +1582,8 @@ /* 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);