comparison src/keyboard.c @ 5194:85a1088ca765

(kbd_buffer_get_event): If user destroys the last frame, exit before calling Fdelete_frame. (read_avail_input): Undo Nov 18 change.

5193:2696563f32ba

#ifdef HAVE_X11
      else if (event->kind == delete_window_event)
	{
	  Lisp_Object value;

	  Fdelete_frame (event->frame_or_window, Qt);
	  kbd_fetch_ptr = event + 1;

	  value = Fvisible_frame_list ();
	  if (! CONSP (value))
	    kill (getpid (), SIGHUP);
	}
#endif
      /* Just discard these, by returning nil.
	 (They shouldn't be found in the buffer,
	 but on some machines it appears they do show up.)  */

#endif

      /* Now read; for one reason or another, this will not block.  */
      while (1)
	{
	  int value = read (fileno (stdin), cbuf, nread);
#ifdef AIX
	  /* The kernel sometimes fails to deliver SIGHUP for ptys.
	     This looks incorrect, but it isn't, because _BSD causes
	     O_NDELAY to be defined in fcntl.h as O_NONBLOCK,
	     and that causes a value other than 0 when there is no input.  */
	  if (value == 0)
	    kill (SIGHUP, 0);
#endif
	  /* Retry the read if it is interrupted.  */
	  if (value >= 0
	      || ! (errno == EAGAIN || errno == EFAULT
#ifdef EBADSLT
		    || errno == EBADSLT
#endif
		    ))
	    {
	      nread = value;
	      break;
	    }
	}

#ifndef FIONREAD
#ifdef USG
      fcntl (fileno (stdin), F_SETFL, 0);

5194:85a1088ca765

#ifdef HAVE_X11
      else if (event->kind == delete_window_event)
	{
	  Lisp_Object value;

	  /* If the user destroys the only frame, Emacs should exit.  */
	  value = Fvisible_frame_list ();
	  if (! CONSP (value) || ! CONSP (XCONS (value)->cdr))
	    kill (getpid (), SIGHUP);

	  Fdelete_frame (event->frame_or_window, Qt);
	  kbd_fetch_ptr = event + 1;
	}
#endif
      /* Just discard these, by returning nil.
	 (They shouldn't be found in the buffer,
	 but on some machines it appears they do show up.)  */

#endif

      /* Now read; for one reason or another, this will not block.  */
      while (1)
	{
	  nread = read (fileno (stdin), cbuf, nread);
#ifdef AIX
	  /* The kernel sometimes fails to deliver SIGHUP for ptys.
	     This looks incorrect, but it isn't, because _BSD causes
	     O_NDELAY to be defined in fcntl.h as O_NONBLOCK,
	     and that causes a value other than 0 when there is no input.  */
	  if (nread == 0)
	    kill (SIGHUP, 0);
#endif
	  /* This code is wrong, but at least it gets the right results.
	     Fix it for 19.23.  */
	  /* Retry the read if it is interrupted.  */
	  if (nread >= 0
	      || ! (errno == EAGAIN || errno == EFAULT
#ifdef EBADSLT
		    || errno == EBADSLT
#endif
		    ))
	    break;
	}

#ifndef FIONREAD
#ifdef USG
      fcntl (fileno (stdin), F_SETFL, 0);