From owner-cvs-src-old@FreeBSD.ORG  Sun May 16 10:23:45 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C9338106566B
	for <cvs-src-old@freebsd.org>; Sun, 16 May 2010 10:23:45 +0000 (UTC)
	(envelope-from stefanf@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D4CF8FC14
	for <cvs-src-old@freebsd.org>; Sun, 16 May 2010 10:23:45 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4GANjub073397
	for <cvs-src-old@freebsd.org>; Sun, 16 May 2010 10:23:45 GMT
	(envelope-from stefanf@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4GANjqk073396
	for cvs-src-old@freebsd.org; Sun, 16 May 2010 10:23:45 GMT
	(envelope-from stefanf@repoman.freebsd.org)
Message-Id: <201005161023.o4GANjqk073396@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	stefanf@repoman.freebsd.org using -f
From: Stefan Farfeleder <stefanf@FreeBSD.org>
Date: Sun, 16 May 2010 10:23:33 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_7
Subject: cvs commit: src/bin/sh eval.c eval.h histedit.c main.c trap.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 May 2010 10:23:45 -0000

stefanf     2010-05-16 10:23:33 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    bin/sh               eval.c eval.h histedit.c main.c trap.c 
  Log:
  SVN rev 208136 on 2010-05-16 10:23:33Z by stefanf
  
  Merge r193169: Fix the eval command in combination with set -e.
  
  Revision  Changes    Path
  1.54.2.4  +5 -3      src/bin/sh/eval.c
  1.11.2.1  +1 -1      src/bin/sh/eval.h
  1.29.2.1  +2 -2      src/bin/sh/histedit.c
  1.29.2.1  +1 -1      src/bin/sh/main.c
  1.32.2.1  +2 -2      src/bin/sh/trap.c