comparison 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.

101398:6b87429f988f

#endif

#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
/* If non-zero, -d was specified, meaning we're using some window system.  */
int display_arg;
#endif

/* An address near the bottom of the stack.
   Tells GC how to save a copy of the stack.  */
char *stack_bottom;

  ns_alloc_autorelease_pool();
  if (!noninteractive)
    {
      char *tmp;
      display_arg = 4;
#ifdef NS_IMPL_COCOA
      if (skip_args < argc)
        {
          if (!strncmp(argv[skip_args], "-psn", 4))
            {

101399:5b58e8f46076

#endif

#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
/* If non-zero, -d was specified, meaning we're using some window system.  */
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;

  ns_alloc_autorelease_pool();
  if (!noninteractive)
    {
      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)
        {
          if (!strncmp(argv[skip_args], "-psn", 4))
            {