Many multibuffer fixes by DLR

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@731 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Chris Allegretta 2001-07-15 20:25:33 +00:00
parent 47f77b4715
commit 307d4c8f6b
3 changed files with 10 additions and 5 deletions

View File

@ -1,4 +1,9 @@
CVS code - 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 nano-1.1.0 - 07/15/2001
- General - General

8
nano.c
View File

@ -2389,7 +2389,7 @@ int main(int argc, char *argv[])
{"tabsize", 1, 0, 'T'}, {"tabsize", 1, 0, 'T'},
#ifdef ENABLE_MULTIBUFFER #ifdef ENABLE_MULTIBUFFER
{"MULTIBUFFER", 0, 0, 'L'}, {"multibuffer", 0, 0, 'F'},
#endif #endif
{0, 0, 0, 0} {0, 0, 0, 0}
@ -2412,17 +2412,17 @@ int main(int argc, char *argv[])
#endif /* ENABLE_NANORC */ #endif /* ENABLE_NANORC */
#ifdef HAVE_GETOPT_LONG #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) { long_options, &option_index)) != EOF) {
#else #else
while ((optchr = while ((optchr =
getopt(argc, argv, "h?LT:RVbcefgijklmpr:s:tvwxz")) != EOF) { getopt(argc, argv, "h?FT:RVbcefgijklmpr:s:tvwxz")) != EOF) {
#endif #endif
switch (optchr) { switch (optchr) {
#ifdef ENABLE_MULTIBUFFER #ifdef ENABLE_MULTIBUFFER
case 'L': case 'F':
SET(MULTIBUFFER); SET(MULTIBUFFER);
break; break;
#endif #endif

View File

@ -61,7 +61,7 @@ rcoption rcopts[NUM_RCOPTS] =
{"nowrap", NO_WRAP}, {"nowrap", NO_WRAP},
{"nohelp", NO_HELP}, {"nohelp", NO_HELP},
{"suspend", SUSPEND}, {"suspend", SUSPEND},
{"loadoninsert", LOADONINSERT}}; {"multibuffer", MULTIBUFFER}};
/* We have an error in some part of the rcfile; put it on stderr and /* 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 */ make the user hit return to continue starting up nano */