Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-18 02:47:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

(minibuf_selected_window): Renamed from Vminibuf_selected_window.

Browse source
This commit is contained in:
Kim F. Storm 2002-02-28 22:11:49 +00:00
parent 3dbab091cb
commit 5705966b35
5 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -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

6
src/dispextern.h
View file

@ -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)

2
src/minibuf.c
View file

@ -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);

2
src/window.h
View file

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

4
src/xdisp.c
View file

@ -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);