aboutsummaryrefslogtreecommitdiff
path: root/contrib/ncurses/ncurses/base/lib_slkinit.c
diff options
context:
space:
mode:
authorRong-En Fan <rafan@FreeBSD.org>2008-02-11 13:37:14 +0000
committerRong-En Fan <rafan@FreeBSD.org>2008-02-11 13:37:14 +0000
commitd8977eaf361f5fdc1261c3f3524988f661ed926e (patch)
tree6e13b0d70c904118d1734988696458ad468a00f1 /contrib/ncurses/ncurses/base/lib_slkinit.c
parent536bf19adc224388608d1ed2df0b31b9dd159c3f (diff)
downloadsrc-d8977eaf361f5fdc1261c3f3524988f661ed926e.tar.gz
src-d8977eaf361f5fdc1261c3f3524988f661ed926e.zip
Import ncurses 5.6-20080209 snapshot onto the vender branchvendor/ncurses/5.6-20080209
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=176187 svn path=/vendor/ncurses/5.6-20080209/; revision=176189; tag=vendor/ncurses/5.6-20080209
Diffstat (limited to 'contrib/ncurses/ncurses/base/lib_slkinit.c')
-rw-r--r--contrib/ncurses/ncurses/base/lib_slkinit.c11
1 files changed, 6 insertions, 5 deletions
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 <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);
}