ncurses 5.6 - patch 20080112

[ncurses.git] / ncurses / base / lib_slkinit.c

diff --git a/ncurses/base/lib_slkinit.c b/ncurses/base/lib_slkinit.c
index 20c0baa596465563871a102567f7dca42177d241..c440109b34e65d94cb914db11e3744d2bdeea610 100644 (file)
--- a/ncurses/base/lib_slkinit.c
+++ b/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 <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
 /*
@@ -38,7 +39,7 @@
  */
 #include <curses.priv.h>
 
-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);
 }