Removed startup banner.
Bugfix: --quit option was handled incorrectly
Showing
1 changed file
with
1 additions
and
14 deletions
... | @@ -91,7 +91,7 @@ parse_opt (int key, char *arg, struct argp_state *state) | ... | @@ -91,7 +91,7 @@ parse_opt (int key, char *arg, struct argp_state *state) |
91 | break; | 91 | break; |
92 | 92 | ||
93 | case 'q': | 93 | case 'q': |
94 | util_do_command ("set quiet"); | 94 | util_do_command ("set quit"); |
95 | break; | 95 | break; |
96 | 96 | ||
97 | case 't': | 97 | case 't': |
... | @@ -139,7 +139,6 @@ parse_opt (int key, char *arg, struct argp_state *state) | ... | @@ -139,7 +139,6 @@ parse_opt (int key, char *arg, struct argp_state *state) |
139 | "it must follow the option\n" | 139 | "it must follow the option\n" |
140 | "without any intervening whitespace.")); | 140 | "without any intervening whitespace.")); |
141 | util_error (_("Run mail --help for more info.")); | 141 | util_error (_("Run mail --help for more info.")); |
142 | util_do_command ("set quiet"); | ||
143 | args->file = arg; | 142 | args->file = arg; |
144 | } | 143 | } |
145 | else | 144 | else |
... | @@ -296,7 +295,6 @@ main (int argc, char **argv) | ... | @@ -296,7 +295,6 @@ main (int argc, char **argv) |
296 | util_do_command ("set nooutfolder"); | 295 | util_do_command ("set nooutfolder"); |
297 | util_do_command ("set nopage"); | 296 | util_do_command ("set nopage"); |
298 | util_do_command ("set prompt=\"? \""); | 297 | util_do_command ("set prompt=\"? \""); |
299 | util_do_command ("set noquiet"); | ||
300 | util_do_command ("set norecord"); | 298 | util_do_command ("set norecord"); |
301 | util_do_command ("set save"); | 299 | util_do_command ("set save"); |
302 | util_do_command ("set screen=%d", util_getlines ()); | 300 | util_do_command ("set screen=%d", util_getlines ()); |
... | @@ -342,7 +340,6 @@ main (int argc, char **argv) | ... | @@ -342,7 +340,6 @@ main (int argc, char **argv) |
342 | util_do_command ("set noasksub"); | 340 | util_do_command ("set noasksub"); |
343 | util_do_command ("set noaskcc"); | 341 | util_do_command ("set noaskcc"); |
344 | util_do_command ("set noaskbcc"); | 342 | util_do_command ("set noaskbcc"); |
345 | util_do_command ("set quiet"); | ||
346 | } | 343 | } |
347 | 344 | ||
348 | /* how should we be running? */ | 345 | /* how should we be running? */ |
... | @@ -351,16 +348,6 @@ main (int argc, char **argv) | ... | @@ -351,16 +348,6 @@ main (int argc, char **argv) |
351 | modelen = strlen (mode); | 348 | modelen = strlen (mode); |
352 | 349 | ||
353 | /* Interactive mode */ | 350 | /* Interactive mode */ |
354 | if (util_getenv (NULL, "quiet", Mail_env_boolean, 0)) | ||
355 | { | ||
356 | fprintf (ofile, | ||
357 | _("%s, Copyright (C) 2001 Free Software Foundation, Inc.\n" | ||
358 | "mail is free software with ABSOLUTELY NO WARRANTY.\n" | ||
359 | "For details type `warranty'.\n" | ||
360 | "Send bug reports to %s.\n"), | ||
361 | argp_program_version, | ||
362 | argp_program_bug_address); | ||
363 | } | ||
364 | 351 | ||
365 | ml_readline_init (); | 352 | ml_readline_init (); |
366 | mail_set_my_name(args.user); | 353 | mail_set_my_name(args.user); | ... | ... |
-
Please register or sign in to post a comment