aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2000-02-02 14:00:00 +0000
committerGerd Moellmann2000-02-02 14:00:00 +0000
commit57629833653065f236b8dd540c85d057e7d1a9ce (patch)
tree443654c21a2c333a2b687a7a4d49278867db382f /src
parent6ea3b61f7e35c691e00df8522d1cea9ae6ccda68 (diff)
downloademacs-57629833653065f236b8dd540c85d057e7d1a9ce.tar.gz
emacs-57629833653065f236b8dd540c85d057e7d1a9ce.zip
(Fframe_parameters): Add GCPRO because tty_color_name can GC.
Diffstat (limited to 'src')
-rw-r--r--src/frame.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/frame.c b/src/frame.c
index aaaf03add34..f8b086196f8 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1991,6 +1991,7 @@ If FRAME is omitted, return information on the currently selected frame.")
1991 Lisp_Object alist; 1991 Lisp_Object alist;
1992 FRAME_PTR f; 1992 FRAME_PTR f;
1993 int height, width; 1993 int height, width;
1994 struct gcpro gcpro1;
1994 1995
1995 if (EQ (frame, Qnil)) 1996 if (EQ (frame, Qnil))
1996 frame = selected_frame; 1997 frame = selected_frame;
@@ -2002,6 +2003,8 @@ If FRAME is omitted, return information on the currently selected frame.")
2002 return Qnil; 2003 return Qnil;
2003 2004
2004 alist = Fcopy_alist (f->param_alist); 2005 alist = Fcopy_alist (f->param_alist);
2006 GCPRO1 (alist);
2007
2005 if (!FRAME_WINDOW_P (f)) 2008 if (!FRAME_WINDOW_P (f))
2006 { 2009 {
2007 int fg = FRAME_FOREGROUND_PIXEL (f); 2010 int fg = FRAME_FOREGROUND_PIXEL (f);
@@ -2042,6 +2045,8 @@ If FRAME is omitted, return information on the currently selected frame.")
2042 XSETFASTINT (lines, FRAME_MENU_BAR_LINES (f)); 2045 XSETFASTINT (lines, FRAME_MENU_BAR_LINES (f));
2043 store_in_alist (&alist, Qmenu_bar_lines, lines); 2046 store_in_alist (&alist, Qmenu_bar_lines, lines);
2044 } 2047 }
2048
2049 UNGCPRO;
2045 return alist; 2050 return alist;
2046} 2051}
2047 2052