diff options
| author | ache <ache@FreeBSD.org> | 2000-03-19 22:00:57 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2000-03-19 22:00:57 +0000 |
| commit | c0502b59de9b1867c80d1f7c141eb7e01e803c49 (patch) | |
| tree | 021889acf6387146348bb609412748223ae44f33 /contrib/libreadline/rlconf.h | |
| parent | f14c3bda44fa0a848a56d984661f9685bba97044 (diff) | |
| download | FreeBSD-src-c0502b59de9b1867c80d1f7c141eb7e01e803c49.zip FreeBSD-src-c0502b59de9b1867c80d1f7c141eb7e01e803c49.tar.gz | |
Merge conflicts
Diffstat (limited to 'contrib/libreadline/rlconf.h')
| -rw-r--r-- | contrib/libreadline/rlconf.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/contrib/libreadline/rlconf.h b/contrib/libreadline/rlconf.h index 1356fd8..fcac3cc 100644 --- a/contrib/libreadline/rlconf.h +++ b/contrib/libreadline/rlconf.h @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /* rlconf.h -- readline configuration definitions */ /* Copyright (C) 1994 Free Software Foundation, Inc. @@ -8,7 +9,7 @@ The Library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 1, or (at your option) + the Free Software Foundation; either version 2, or (at your option) any later version. The Library is distributed in the hope that it will be useful, but @@ -19,7 +20,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 675 Mass Ave, Cambridge, MA 02139, USA. */ + 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #if !defined (_RLCONF_H_) #define _RLCONF_H_ @@ -30,10 +31,6 @@ /* Define this to get an indication of file type when listing completions. */ #define VISIBLE_STATS -/* If defined, readline shows opening parens and braces when closing - paren or brace entered. */ -/* #define PAREN_MATCHING */ - /* This definition is needed by readline.c, rltty.c, and signals.c. */ /* If on, then readline handles signals in a way that doesn't screw. */ #define HANDLE_SIGNALS |
