ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
master
Benno Schulenberg 2015-06-20 18:48:43 +00:00
parent 7f0003a54b
commit 4499520c03
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -9,6 +9,8 @@
only when the specified menu name is an existing one. only when the specified menu name is an existing one.
* doc/syntax/changelog.nanorc: Stop the changed-files colour from * doc/syntax/changelog.nanorc: Stop the changed-files colour from
spilling beyond a blank line. Also highlight releases. 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> 2015-06-18 Benno Schulenberg <bensberg@justemail.net>
* src/rcfile.c: Allow a tiny nano's ~/.nanorc to enable search and * src/rcfile.c: Allow a tiny nano's ~/.nanorc to enable search and

3
src/nano.c
View File

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

2
src/rcfile.c
View File

@ -96,10 +96,10 @@ static const rcoption rcopts[] = {
{"quiet", QUIET}, {"quiet", QUIET},
{"smarthome", SMART_HOME}, {"smarthome", SMART_HOME},
{"smooth", SMOOTH_SCROLL}, {"smooth", SMOOTH_SCROLL},
{"softwrap", SOFTWRAP},
{"tabstospaces", TABS_TO_SPACES}, {"tabstospaces", TABS_TO_SPACES},
{"whitespace", 0}, {"whitespace", 0},
{"wordbounds", WORD_BOUNDS}, {"wordbounds", WORD_BOUNDS},
{"softwrap", SOFTWRAP},
#endif #endif
#ifndef DISABLE_COLOR #ifndef DISABLE_COLOR
{"titlecolor", 0}, {"titlecolor", 0},