From shinra@j10n.org  Sat May  3 14:13:20 2003
Return-Path: <shinra@j10n.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 17C9837B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  3 May 2003 14:13:20 -0700 (PDT)
Received: from mx.j10n.org (203.141.155.228.user.ca.il24.net [203.141.155.228])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 93AA943FBD
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  3 May 2003 14:13:18 -0700 (PDT)
	(envelope-from shinra@j10n.org)
Received: from e-note.j10n.org (e-note.j10n.org [IPv6:2002:cb8d:9be4:1::1])
	by mx.j10n.org (8.12.8p1/8.12.8) with ESMTP id h43LDEwm053704
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 4 May 2003 06:13:14 +0900 (JST)
	(envelope-from shinra@j10n.org)
Received: from e-note.j10n.org (localhost [IPv6:::1])
	by e-note.j10n.org (8.12.9/8.12.9) with ESMTP id h43LDE50025791
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 4 May 2003 06:13:14 +0900 (JST)
	(envelope-from shinra@j10n.org)
Received: (from shinra@localhost)
	by e-note.j10n.org (8.12.9/8.12.9/Submit) id h43LDDQ7025790;
	Sun, 4 May 2003 06:13:13 +0900 (JST)
	(envelope-from shinra@j10n.org)
Message-Id: <200305032113.h43LDDQ7025790@e-note.j10n.org>
Date: Sun, 4 May 2003 06:13:13 +0900 (JST)
From: AIDA Shinra <shinra@j10n.org>
Reply-To: AIDA Shinra <shinra@j10n.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] Obsolete freebsd local hack to info(1)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         51733
>Category:       gnu
>Synopsis:       [PATCH] Obsolete freebsd local hack to info(1)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ru
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 03 14:20:18 PDT 2003
>Closed-Date:    Wed Jun 18 07:08:50 PDT 2003
>Last-Modified:  Wed Jun 18 07:08:50 PDT 2003
>Originator:     AIDA Shinra
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD e-note 5.0-CURRENT FreeBSD 5.0-CURRENT #12: Sat Apr 26 11:14:26 JST 2003 shinra@e-note:/usr/obj/usr/freebsd/src/sys/LOCAL i386


>Description:
contrib/texinfo/info/signals.c contains a local hack to pretend SIGWINCH when
received SIGCONT. Its was a workaround to following situation:

C-z
Resize terminal
fg

But the hack only changed a bug to another bug. Now texinfo 4.5 has a correct
solution for the problem so the hack is no longer required.

>How-To-Repeat:
>Fix:
Simply remove our hack.

Index: src/contrib/texinfo/info/signals.c
diff -u src/contrib/texinfo/info/signals.c:1.7 src/contrib/texinfo/info/signals.c:1.1.1.4
--- src/contrib/texinfo/info/signals.c:1.7	Thu May  1 19:50:59 2003
+++ src/contrib/texinfo/info/signals.c	Thu May  1 19:48:41 2003
@@ -1,6 +1,5 @@
 /* signals.c -- install and maintain Info signal handlers.
    $Id: signals.c,v 1.4 2003/01/29 19:23:22 karl Exp $
-   $FreeBSD: /cvs/cvsup/ncvs/src/contrib/texinfo/info/signals.c,v 1.7 2003/05/02 00:50:59 ru Exp $
 
    Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003 Free Software
    Foundation, Inc.
@@ -114,7 +113,7 @@
 #endif /* !HAVE_SIGACTION */
 
 static signal_info old_TSTP, old_TTOU, old_TTIN;
-static signal_info old_WINCH, old_INT, old_USR1, old_CONT;
+static signal_info old_WINCH, old_INT, old_USR1;
 
 void
 initialize_info_signal_handler ()
@@ -133,10 +132,7 @@
 
 #if defined (SIGWINCH)
   set_termsig (SIGWINCH, &old_WINCH);
-#if defined (SIGCONT)
-  set_termsig (SIGCONT, &old_CONT);
 #endif
-#endif
 
 #if defined (SIGINT)
   set_termsig (SIGINT, &old_INT);
@@ -238,12 +234,6 @@
 
 #if defined (SIGWINCH) || defined (SIGUSR1)
 #ifdef SIGWINCH
-#ifdef SIGCONT
-    case SIGCONT:
-      /* pretend a SIGWINCH in case the terminal window size has changed
-	 while we've been asleep */
-      /* FALLTHROUGH */
-#endif
     case SIGWINCH:
 #endif
 #ifdef SIGUSR1
@@ -255,10 +245,6 @@
 #ifdef SIGWINCH
 	if (sig == SIGWINCH)
 	  old_signal_handler = &old_WINCH;
-#ifdef SIGCONT
-	else if (sig == SIGCONT)
-	  old_signal_handler = &old_CONT;
-#endif
 #endif
 #ifdef SIGUSR1
 	if (sig == SIGUSR1)
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->ru 
Responsible-Changed-By: johan 
Responsible-Changed-When: Tue May 6 14:10:15 PDT 2003 
Responsible-Changed-Why:  
Over to texinfo maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=51733 
State-Changed-From-To: open->closed 
State-Changed-By: ru 
State-Changed-When: Wed Jun 18 07:04:10 PDT 2003 
State-Changed-Why:  
Applied, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=51733 
>Unformatted:
