diff options
| author | ache <ache@FreeBSD.org> | 2006-12-31 09:22:31 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2006-12-31 09:22:31 +0000 |
| commit | 7bc20ca0377a1f9fdc6fd39b7e2edca8d896bd4f (patch) | |
| tree | c91b07b71e572bdcd597c50939fee7fdefa1889a /contrib/libreadline/rlconf.h | |
| parent | b27381111678c85b80c37941a6194a4dd507fedb (diff) | |
| download | FreeBSD-src-7bc20ca0377a1f9fdc6fd39b7e2edca8d896bd4f.zip FreeBSD-src-7bc20ca0377a1f9fdc6fd39b7e2edca8d896bd4f.tar.gz | |
Merge conflicts
Diffstat (limited to 'contrib/libreadline/rlconf.h')
| -rw-r--r-- | contrib/libreadline/rlconf.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/libreadline/rlconf.h b/contrib/libreadline/rlconf.h index 537ec0f..041abba 100644 --- a/contrib/libreadline/rlconf.h +++ b/contrib/libreadline/rlconf.h @@ -1,5 +1,4 @@ /* $FreeBSD$ */ - /* rlconf.h -- readline configuration definitions */ /* Copyright (C) 1994 Free Software Foundation, Inc. @@ -39,9 +38,12 @@ /* Ugly but working hack for binding prefix meta. */ #define PREFIX_META_HACK -/* The final, last-ditch effort file name for an init file. */ +/* The next-to-last-ditch effort file name for a user-specific init file. */ #define DEFAULT_INPUTRC "~/.inputrc" +/* The ultimate last-ditch filenname for an init file -- system-wide. */ +#define SYS_INPUTRC "/etc/inputrc" + /* If defined, expand tabs to spaces. */ #define DISPLAY_TABS |
