Many multibuffer fixes by DLR

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@731 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 77e403662ccacf0c077501f1b2875e505ab1e0e2..0075fe431892d35798975b08314865b5f6d99716 100644 (file)
--- 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 cdfba353309c0e3e983cf3bb06598bdae148c0a3..819aee1bb190b640945f55dd2a2cf41e2f7d0926 100644 (file)
--- 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 36342108b84c74e461126dc63d22964120f16f1b..d659a92555dbbd83576a9f85d7ff2fc9f5fdc673 100644 (file)
--- 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 */