From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 29 Aug 2007 21:47:40 +0000 (+0000)
Subject: (make_terminal_frame): Yet Another Int/Lisp_Object Mixup.
X-Git-Tag: emacs-pretest-23.0.90~11207
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b1cb6b202b15a0518d552b273f3b29520a78c8a3;p=emacs.git

(make_terminal_frame): Yet Another Int/Lisp_Object Mixup.
(Fmodify_frame_parameters): Return a value.
---

diff --git a/src/frame.c b/src/frame.c
index 091abfdbf31..f721a829e2b 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -625,7 +625,7 @@ make_terminal_frame (struct terminal *terminal)
     FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none;
 
     /* Set the top frame to the newly created frame. */
-    if (FRAME_TTY (f)->top_frame
+    if (FRAMEP (FRAME_TTY (f)->top_frame)
         && FRAME_LIVE_P (XFRAME (FRAME_TTY (f)->top_frame)))
       XFRAME (FRAME_TTY (f)->top_frame)->async_visible = 2; /* obscured */
     
@@ -2613,6 +2613,7 @@ enabled such bindings for that variable with `make-variable-frame-local'.  */)
 	    call1 (Qframe_set_background_mode, frame);
 	}
     }
+  return Qnil;
 }
 
 DEFUN ("frame-with-environment", Fframe_with_environment, Sframe_with_environment, 0, 1, 0,