comparison src/emacs.c @ 105081:28ad66a103d9

(inhibit_x_resources): Update doc string for NS. (main) [HAVE_NS]: Don't process --no-init-file option. Remove legacy code for -NXHost.

105080:37b8e423433c

#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;

#ifdef HAVE_NS
  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--;
        }
#ifdef NS_IMPL_COCOA
      if (skip_args < argc)
        {
          if (!strncmp(argv[skip_args], "-psn", 4))
            {

            {
              skip_args += 2;
              chdir (getenv ("HOME"));
            }
        }
#endif
      /* This used for remote operation.. not fully implemented yet. */
      if (argmatch (argv, argc, "-_NSMachLaunch", 0, 3, &tmp, &skip_args))
          display_arg = 4;
      else if (argmatch (argv, argc, "-MachLaunch", 0, 3, &tmp, &skip_args))
          display_arg = 4;
      else if (argmatch (argv, argc, "-macosx", 0, 2, NULL, &skip_args))
          display_arg = 4;
      else if (argmatch (argv, argc, "-NSHost", 0, 3, &tmp, &skip_args))
          display_arg = 4;
    }
#endif /* HAVE_NS */

#ifdef HAVE_X_WINDOWS
  /* Stupid kludge to catch command-line display spec.  We can't

	       doc: /* Value of `current-time' after loading the init files.
This is nil during initialization.  */);
  Vafter_init_time = Qnil;

  DEFVAR_BOOL ("inhibit-x-resources", &inhibit_x_resources,
	       doc: /* If non-nil, X resources and Windows Registry settings are not used.  */);
  inhibit_x_resources = 0;

  /* Make sure IS_DAEMON starts up as false.  */
  daemon_pipe[1] = 0;
}

105081:28ad66a103d9

#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;

#ifdef HAVE_NS
  ns_alloc_autorelease_pool();
  if (!noninteractive)
    {
#ifdef NS_IMPL_COCOA
      if (skip_args < argc)
        {
          if (!strncmp(argv[skip_args], "-psn", 4))
            {

            {
              skip_args += 2;
              chdir (getenv ("HOME"));
            }
        }
#endif  /* COCOA */
    }
#endif /* HAVE_NS */

#ifdef HAVE_X_WINDOWS
  /* Stupid kludge to catch command-line display spec.  We can't

	       doc: /* Value of `current-time' after loading the init files.
This is nil during initialization.  */);
  Vafter_init_time = Qnil;

  DEFVAR_BOOL ("inhibit-x-resources", &inhibit_x_resources,
	       doc: /* If non-nil, X resources, Windows Registry settings, and NS defaults are not used.  */);
  inhibit_x_resources = 0;

  /* Make sure IS_DAEMON starts up as false.  */
  daemon_pipe[1] = 0;
}