comparison lib-src/emacsclient.c @ 88014:e830695cdb7f

(decode_options): Default to a NULL display, as Emacs-22. Allow the -d option under w32 again, for those rare cases where it actually does make sense.

88013:b0c61850537b

decode_options (argc, argv)
     int argc;
     char **argv;
{
  alternate_editor = egetenv ("ALTERNATE_EDITOR");
#ifndef WINDOWSNT
  display = egetenv ("DISPLAY");
  if (display && strlen (display) == 0)
    display = NULL;
#endif

  while (1)
    {
      int opt = getopt_long (argc, argv,

	case 'f':
	  server_file = optarg;
	  break;

#ifndef WINDOWSNT
	case 'd':
	  display = optarg;
	  break;
#endif

	  message (TRUE, "Try `%s --help' for more information\n", progname);
	  exit (EXIT_FAILURE);
	  break;
	}
    }

  if (!tty && display)
    window_system = 1;
#if !defined (WINDOWSNT) && !defined (HAVE_CARBON)
  else

88014:e830695cdb7f

decode_options (argc, argv)
     int argc;
     char **argv;
{
  alternate_editor = egetenv ("ALTERNATE_EDITOR");

  /* We used to set `display' to $DISPLAY by default, but this changed the
     default behavior and is sometimes inconvenient.  So instead of forcing
     users to say "--display ''" when they want to use Emacs's existing tty
     or display connection, we force them to use "--display $DISPLAY" if
     they want Emacs to connect to their current display.  */
#if 0
  display = egetenv ("DISPLAY");
#endif

  while (1)
    {
      int opt = getopt_long (argc, argv,

	case 'f':
	  server_file = optarg;
	  break;

	  /* We used to disallow this argument in w32, but it seems better
	     to allow it, for the occasional case where the user is
	     connecting with a w32 client to a server compiled with X11
	     support.  */
#if 1 /* !defined WINDOWS */
	case 'd':
	  display = optarg;
	  break;
#endif

	  message (TRUE, "Try `%s --help' for more information\n", progname);
	  exit (EXIT_FAILURE);
	  break;
	}
    }

  if (display && strlen (display) == 0)
    display = NULL;

  if (!tty && display)
    window_system = 1;
#if !defined (WINDOWSNT) && !defined (HAVE_CARBON)
  else