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

remove the -D/--dos and -M/--mac command line options, as they aren't 

much use with the new file format autodetection


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1973 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2004-10-07 20:54:52 +00:00
parent 211dc82738
commit 28caf14863
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -69,6 +69,8 @@ CVS code -
preserve them across multiple file buffers. Changes to preserve them across multiple file buffers. Changes to
read_file(), add_open_file(), and load_open_file(). (DLR, read_file(), add_open_file(), and load_open_file(). (DLR,
suggested by Bill Soudan) suggested by Bill Soudan)
- Remove the -D/--dos and -M/--mac command line options, as they
aren't much use with the new file format autodetection. (DLR)
- files.c: - files.c:
do_insertfile() do_insertfile()
- Readd the NANO_SMALL #ifdef around the start_again: label to - Readd the NANO_SMALL #ifdef around the start_again: label to

14
src/nano.c
View File

@ -667,7 +667,6 @@ void usage(void)
#ifndef NANO_SMALL #ifndef NANO_SMALL
print1opt("-A", "--smarthome", N_("Enable smart home key")); print1opt("-A", "--smarthome", N_("Enable smart home key"));
print1opt("-B", "--backup", N_("Backup existing files on save")); print1opt("-B", "--backup", N_("Backup existing files on save"));
print1opt("-D", "--dos", N_("Write file in DOS format"));
print1opt(_("-E [dir]"), _("--backupdir=[dir]"), N_("Directory for writing backup files")); print1opt(_("-E [dir]"), _("--backupdir=[dir]"), N_("Directory for writing backup files"));
#endif #endif
#ifdef ENABLE_MULTIBUFFER #ifdef ENABLE_MULTIBUFFER
@ -680,7 +679,6 @@ void usage(void)
print1opt("-I", "--ignorercfiles", N_("Don't look at nanorc files")); print1opt("-I", "--ignorercfiles", N_("Don't look at nanorc files"));
#endif #endif
#ifndef NANO_SMALL #ifndef NANO_SMALL
print1opt("-M", "--mac", N_("Write file in Mac format"));
print1opt("-N", "--noconvert", N_("Don't convert files from DOS/Mac format")); print1opt("-N", "--noconvert", N_("Don't convert files from DOS/Mac format"));
#endif #endif
#ifndef DISABLE_JUSTIFY #ifndef DISABLE_JUSTIFY
@ -3048,9 +3046,7 @@ int main(int argc, char **argv)
#ifndef NANO_SMALL #ifndef NANO_SMALL
{"smarthome", 0, 0, 'A'}, {"smarthome", 0, 0, 'A'},
{"backup", 0, 0, 'B'}, {"backup", 0, 0, 'B'},
{"dos", 0, 0, 'D'},
{"backupdir", 1, 0, 'E'}, {"backupdir", 1, 0, 'E'},
{"mac", 0, 0, 'M'},
{"noconvert", 0, 0, 'N'}, {"noconvert", 0, 0, 'N'},
{"smooth", 0, 0, 'S'}, {"smooth", 0, 0, 'S'},
{"restricted", 0, 0, 'Z'}, {"restricted", 0, 0, 'Z'},
@ -3076,9 +3072,9 @@ int main(int argc, char **argv)
while ((optchr = while ((optchr =
#ifdef HAVE_GETOPT_LONG #ifdef HAVE_GETOPT_LONG
getopt_long(argc, argv, "h?ABDE:FHIMNQ:RST:VY:Zabcdefgijklmo:pr:s:tvwxz", long_options, NULL) getopt_long(argc, argv, "h?ABE:FHINQ:RST:VY:Zabcdefgijklmo:pr:s:tvwxz", long_options, NULL)
#else #else
getopt(argc, argv, "h?ABDE:FHIMNQ:RST:VY:Zabcdefgijklmo:pr:s:tvwxz") getopt(argc, argv, "h?ABE:FHINQ:RST:VY:Zabcdefgijklmo:pr:s:tvwxz")
#endif #endif
) != -1) { ) != -1) {
@ -3098,9 +3094,6 @@ int main(int argc, char **argv)
case 'B': case 'B':
SET(BACKUP_FILE); SET(BACKUP_FILE);
break; break;
case 'D':
SET(DOS_FILE);
break;
case 'E': case 'E':
backup_dir = mallocstrcpy(backup_dir, optarg); backup_dir = mallocstrcpy(backup_dir, optarg);
break; break;
@ -3121,9 +3114,6 @@ int main(int argc, char **argv)
break; break;
#endif #endif
#ifndef NANO_SMALL #ifndef NANO_SMALL
case 'M':
SET(MAC_FILE);
break;
case 'N': case 'N':
SET(NO_CONVERT); SET(NO_CONVERT);
break; break;