From d8977eaf361f5fdc1261c3f3524988f661ed926e Mon Sep 17 00:00:00 2001 From: Rong-En Fan Date: Mon, 11 Feb 2008 13:37:14 +0000 Subject: Import ncurses 5.6-20080209 snapshot onto the vender branch --- contrib/ncurses/ncurses/base/lib_slkinit.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'contrib/ncurses/ncurses/base/lib_slkinit.c') diff --git a/contrib/ncurses/ncurses/base/lib_slkinit.c b/contrib/ncurses/ncurses/base/lib_slkinit.c index 20c0baa59646..c440109b34e6 100644 --- a/contrib/ncurses/ncurses/base/lib_slkinit.c +++ b/contrib/ncurses/ncurses/base/lib_slkinit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2000,2007 Free Software Foundation, Inc. * + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -29,6 +29,7 @@ /**************************************************************************** * Author: Zeyd M. Ben-Halim 1992,1995 * * and: Eric S. Raymond * + * and: Thomas E. Dickey 1996-on * ****************************************************************************/ /* @@ -38,7 +39,7 @@ */ #include -MODULE_ID("$Id: lib_slkinit.c,v 1.6 2007/05/12 18:14:21 tom Exp $") +MODULE_ID("$Id: lib_slkinit.c,v 1.7 2008/01/12 20:23:39 tom Exp $") NCURSES_EXPORT(int) slk_init(int format) @@ -46,9 +47,9 @@ slk_init(int format) int code = ERR; T((T_CALLED("slk_init(%d)"), format)); - if (format >= 0 && format <= 3 && !_nc_slk_format) { - _nc_slk_format = 1 + format; - code = _nc_ripoffline(-SLK_LINES(_nc_slk_format), _nc_slk_initialize); + if (format >= 0 && format <= 3 && !_nc_globals.slk_format) { + _nc_globals.slk_format = 1 + format; + code = _nc_ripoffline(-SLK_LINES(_nc_globals.slk_format), _nc_slk_initialize); } returnCode(code); } -- cgit v1.2.3