diff options
| author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-01-23 09:58:02 +0000 |
|---|---|---|
| committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-01-23 09:58:02 +0000 |
| commit | 3436b70cbe074ecfdf378c53d3dbe3566afbd791 (patch) | |
| tree | 91f181b5de6a4637183d14f1682102ac3476d685 /src/emacs.c | |
| parent | b3243e6f1a45b2dc2dfda676332a0fd20d0e6e57 (diff) | |
| download | emacs-3436b70cbe074ecfdf378c53d3dbe3566afbd791.tar.gz | |
* 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.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/emacs.c b/src/emacs.c index df5e4cdeeb4..1b4872bf4c9 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -202,6 +202,10 @@ extern int inherited_pgroup; 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 @@ main (int argc, char **argv) { 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) { |