X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Fcomp_parse.c;h=814d1116c6717e8400bd3c6865194289451a4c93;hp=9060886b55a23d3fe543667fb615497445b7d63b;hb=dff527f594001b2aed593868bd7774c86eec813d;hpb=4e793faf6575b2297482f77b2bc3d18105c0fc76

diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index 9060886b..814d1116 100644
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -47,7 +47,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: comp_parse.c,v 1.87 2013/05/25 20:20:08 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.89 2013/07/13 21:55:32 tom Exp $")
 
 static void sanity_check2(TERMTYPE *, bool);
 NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2;
@@ -162,18 +162,15 @@ name_ending(char *name)
 static bool
 remove_collision(char *n1, char *n2)
 {
-    char *p1 = n1;
     char *p2 = n2;
     char *pstart, *qstart, *pend, *qend;
     bool removed = FALSE;
 
 #if NCURSES_USE_TERMCAP && NCURSES_XNAMES
     if ((_nc_syntax == SYN_TERMCAP) && _nc_user_definable) {
-	p1 = n1 = skip_index(n1);
+	n1 = skip_index(n1);
 	p2 = n2 = skip_index(n2);
     }
-#else
-    (void) p1;
 #endif
 
     for (pstart = n1; (pend = name_ending(pstart)); pstart = next_name(pend)) {
@@ -486,12 +483,12 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
 		    memset(&fake_tm, 0, sizeof(fake_tm));
 		    fake_sp._term = &fake_tm;
 		    fake_tm.type = qp->tterm;
-		    SP = &fake_sp;
+		    _nc_set_screen(&fake_sp);
 		    set_curterm(&fake_tm);
 
 		    _nc_check_termtype2(&qp->tterm, literal);
 
-		    SP = save_SP;
+		    _nc_set_screen(save_SP);
 		    set_curterm(save_tm);
 		} else {
 		    fixup_acsc(&qp->tterm, literal);