Mercurial > emacs
diff src/emacs.c @ 101399:5b58e8f46076
* emacs.c (ns_no_defaults): New declaration. (main): Use it. * nsterm.h (ns_no_defaults): New declaration. * nsfns.m (x_get_string_resource): Don't read when ns_no_defaults. * nsterm.m (ns_no_defaults): New variable. (ns_initialize): Don't read defaults when ns_no_defaults.
author | Adrian Robert <Adrian.B.Robert@gmail.com> |
---|---|
date | Fri, 23 Jan 2009 09:58:02 +0000 |
parents | 6b87429f988f |
children | 6381c0548cdd |
line wrap: on
line diff
--- a/src/emacs.c Fri Jan 23 09:12:53 2009 +0000 +++ b/src/emacs.c Fri Jan 23 09:58:02 2009 +0000 @@ -202,6 +202,10 @@ int display_arg; #endif +#ifdef HAVE_NS +extern char ns_no_defaults; +#endif + /* An address near the bottom of the stack. Tells GC how to save a copy of the stack. */ char *stack_bottom; @@ -1473,6 +1477,16 @@ { char *tmp; display_arg = 4; + if (argmatch (argv, argc, "-q", "--no-init-file", 6, NULL, &skip_args)) + { + ns_no_defaults = 1; + skip_args--; + } + if (argmatch (argv, argc, "-Q", "--quick", 5, NULL, &skip_args)) + { + ns_no_defaults = 1; + skip_args--; + } #ifdef NS_IMPL_COCOA if (skip_args < argc) {