Removing the obsolete long option --undo, and sorting some things.

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

diff --git a/ChangeLog b/ChangeLog
index c1c43a0236bf772deb6662b4da860b988505c12f..209ba0067852c6d3cf596a98c1931aa24011a040 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
        only when the specified menu name is an existing one.
        * doc/syntax/changelog.nanorc: Stop the changed-files colour from
        spilling beyond a blank line.  Also highlight releases.
+       * src/nano.c (main), src/rcfile.c: Remove the obsolete long option
+       --undo.  And sort --help and the softwrap option more consistently.
 
 2015-06-18  Benno Schulenberg  <bensberg@justemail.net>
        * src/rcfile.c: Allow a tiny nano's ~/.nanorc to enable search and

diff --git a/src/nano.c b/src/nano.c
index e5540a06a1deea698c0b7ccce1007461e5e41862..e87caa87011c99b31fd15faa2fe6aeb5a092cdd9 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -2103,7 +2103,6 @@ int main(int argc, char **argv)
 #endif
 #ifdef HAVE_GETOPT_LONG
     const struct option long_options[] = {
-       {"help", 0, NULL, 'h'},
        {"boldtext", 0, NULL, 'D'},
 #ifndef DISABLE_MULTIBUFFER
        {"multibuffer", 0, NULL, 'F'},
@@ -2125,6 +2124,7 @@ int main(int argc, char **argv)
 #endif
        {"const", 0, NULL, 'c'},
        {"rebinddelete", 0, NULL, 'd'},
+       {"help", 0, NULL, 'h'},
        {"nofollow", 0, NULL, 'l'},
 #ifndef DISABLE_MOUSE
        {"mouse", 0, NULL, 'm'},
@@ -2159,7 +2159,6 @@ int main(int argc, char **argv)
        {"poslog", 0, NULL, 'P'},
        {"smooth", 0, NULL, 'S'},
        {"quickblank", 0, NULL, 'U'},
-       {"undo", 0, NULL, 'u'},
        {"wordbounds", 0, NULL, 'W'},
        {"autoindent", 0, NULL, 'i'},
        {"cut", 0, NULL, 'k'},

diff --git a/src/rcfile.c b/src/rcfile.c
index 3382a0d97b7ba7c1212eebff4351ab2719e0c930..358883dad901e8d814dea743b3ab224bceb700f2 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -96,10 +96,10 @@ static const rcoption rcopts[] = {
     {"quiet", QUIET},
     {"smarthome", SMART_HOME},
     {"smooth", SMOOTH_SCROLL},
+    {"softwrap", SOFTWRAP},
     {"tabstospaces", TABS_TO_SPACES},
     {"whitespace", 0},
     {"wordbounds", WORD_BOUNDS},
-    {"softwrap", SOFTWRAP},
 #endif
 #ifndef DISABLE_COLOR
     {"titlecolor", 0},