Commit 12cae7c0 authored by Karl Heuer's avatar Karl Heuer
Browse files

(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not

initialization.
parent 3814ccf5
...@@ -615,8 +615,9 @@ static ...@@ -615,8 +615,9 @@ static
unshow_buffer (w) unshow_buffer (w)
register struct window *w; register struct window *w;
{ {
Lisp_Object buf = w->buffer; Lisp_Object buf;
buf = w->buffer;
if (XBUFFER (buf) != XMARKER (w->pointm)->buffer) if (XBUFFER (buf) != XMARKER (w->pointm)->buffer)
abort (); abort ();
...@@ -1219,7 +1220,8 @@ window_loop (type, obj, mini, frames) ...@@ -1219,7 +1220,8 @@ window_loop (type, obj, mini, frames)
on the frame, find a new buffer to display there. */ on the frame, find a new buffer to display there. */
if (NILP (XWINDOW (w)->parent)) if (NILP (XWINDOW (w)->parent))
{ {
Lisp_Object new_buffer = Fother_buffer (obj, Qnil); Lisp_Object new_buffer;
new_buffer = Fother_buffer (obj, Qnil);
if (NILP (new_buffer)) if (NILP (new_buffer))
new_buffer new_buffer
= Fget_buffer_create (build_string ("*scratch*")); = Fget_buffer_create (build_string ("*scratch*"));
...@@ -1252,7 +1254,8 @@ window_loop (type, obj, mini, frames) ...@@ -1252,7 +1254,8 @@ window_loop (type, obj, mini, frames)
if (EQ (XWINDOW (w)->buffer, obj)) if (EQ (XWINDOW (w)->buffer, obj))
{ {
/* Find another buffer to show in this window. */ /* Find another buffer to show in this window. */
Lisp_Object another_buffer = Fother_buffer (obj, Qnil); Lisp_Object another_buffer;
another_buffer = Fother_buffer (obj, Qnil);
if (NILP (another_buffer)) if (NILP (another_buffer))
another_buffer another_buffer
= Fget_buffer_create (build_string ("*scratch*")); = Fget_buffer_create (build_string ("*scratch*"));
...@@ -1735,8 +1738,9 @@ Returns the window displaying BUFFER.") ...@@ -1735,8 +1738,9 @@ Returns the window displaying BUFFER.")
#endif #endif
) )
{ {
Lisp_Object frames = Qnil; Lisp_Object frames;
frames = Qnil;
#ifdef MULTI_FRAME #ifdef MULTI_FRAME
if (FRAME_MINIBUF_ONLY_P (selected_frame)) if (FRAME_MINIBUF_ONLY_P (selected_frame))
XSET (frames, Lisp_Frame, last_nonminibuf_frame); XSET (frames, Lisp_Frame, last_nonminibuf_frame);
......
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