From 307d4c8f6b31c9221a0c2eb7777c93e49e84e0dc Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Sun, 15 Jul 2001 20:25:33 +0000 Subject: [PATCH] Many multibuffer fixes by DLR git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@731 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 5 +++++ nano.c | 8 ++++---- rcfile.c | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77e40366..0075fe43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ CVS code - +- nano.c: + main() + - Change the getop option to 'F' (David Lawrence Ramsey) +- rcfile.c: + - Update for the multibuffer option (oops) (David Lawrence Ramsey). nano-1.1.0 - 07/15/2001 - General diff --git a/nano.c b/nano.c index cdfba353..819aee1b 100644 --- a/nano.c +++ b/nano.c @@ -2389,7 +2389,7 @@ int main(int argc, char *argv[]) {"tabsize", 1, 0, 'T'}, #ifdef ENABLE_MULTIBUFFER - {"MULTIBUFFER", 0, 0, 'L'}, + {"multibuffer", 0, 0, 'F'}, #endif {0, 0, 0, 0} @@ -2412,17 +2412,17 @@ int main(int argc, char *argv[]) #endif /* ENABLE_NANORC */ #ifdef HAVE_GETOPT_LONG - while ((optchr = getopt_long(argc, argv, "h?LT:RVbcefgijklmpr:s:tvwxz", + while ((optchr = getopt_long(argc, argv, "h?FT:RVbcefgijklmpr:s:tvwxz", long_options, &option_index)) != EOF) { #else while ((optchr = - getopt(argc, argv, "h?LT:RVbcefgijklmpr:s:tvwxz")) != EOF) { + getopt(argc, argv, "h?FT:RVbcefgijklmpr:s:tvwxz")) != EOF) { #endif switch (optchr) { #ifdef ENABLE_MULTIBUFFER - case 'L': + case 'F': SET(MULTIBUFFER); break; #endif diff --git a/rcfile.c b/rcfile.c index 36342108..d659a925 100644 --- a/rcfile.c +++ b/rcfile.c @@ -61,7 +61,7 @@ rcoption rcopts[NUM_RCOPTS] = {"nowrap", NO_WRAP}, {"nohelp", NO_HELP}, {"suspend", SUSPEND}, -{"loadoninsert", LOADONINSERT}}; +{"multibuffer", MULTIBUFFER}}; /* We have an error in some part of the rcfile; put it on stderr and make the user hit return to continue starting up nano */ -- 2.39.5