From owner-svn-src-all@FreeBSD.ORG Thu Apr 26 00:51:44 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7CC101065672; Thu, 26 Apr 2012 00:51:44 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4E7C78FC14; Thu, 26 Apr 2012 00:51:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3Q0piKC022435; Thu, 26 Apr 2012 00:51:44 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3Q0piHA022432; Thu, 26 Apr 2012 00:51:44 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201204260051.q3Q0piHA022432@svn.freebsd.org> From: "David E. O'Brien" Date: Thu, 26 Apr 2012 00:51:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r234690 - head/lib/libedit/edit/readline X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Apr 2012 00:51:44 -0000 Author: obrien Date: Thu Apr 26 00:51:43 2012 New Revision: 234690 URL: http://svn.freebsd.org/changeset/base/234690 Log: Correct r228114 and use the same implementation for tilde.h as for history.h Added: head/lib/libedit/edit/readline/tilde.h - copied unchanged from r234451, head/lib/libedit/edit/readline/history.h Modified: head/lib/libedit/edit/readline/Makefile Modified: head/lib/libedit/edit/readline/Makefile ============================================================================== --- head/lib/libedit/edit/readline/Makefile Thu Apr 26 00:18:38 2012 (r234689) +++ head/lib/libedit/edit/readline/Makefile Thu Apr 26 00:51:43 2012 (r234690) @@ -1,8 +1,7 @@ # Copyright (c) 2011 David E O'Brien # $FreeBSD$ -INCS= readline.h history.h -INCSLINKS= readline.h ${INCSDIR}/tilde.h +INCS= readline.h history.h tilde.h INCSDIR= ${INCLUDEDIR}/edit/readline Copied: head/lib/libedit/edit/readline/tilde.h (from r234451, head/lib/libedit/edit/readline/history.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libedit/edit/readline/tilde.h Thu Apr 26 00:51:43 2012 (r234690, copy of r234451, head/lib/libedit/edit/readline/history.h) @@ -0,0 +1,32 @@ +/*- + * Copyright (c) 2011 David E. O'Brien + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the author nor the names of contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include