upstream

diff --cc autogen/configure
index b7cee129757639bdea87a4e7adb391de33b13674,961d1acbd38c3f4f1124ef39bd5f21a58f99c962..8268da38b5250ff80f04dc7080b35c0cc3830087
--- 1/autogen/configure
--- 2/autogen/configure
+++ b/autogen/configure
@@@ -13694,8 -13258,18 +13694,23 @@@ f
  
  
  # PTY-related GNU extensions.
++<<<<<<< TREE
++
 +
++=======
+ for ac_func in getpt posix_openpt
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+ eval as_val=\$$as_ac_var
+    if test "x$as_val" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
  
+ fi
+ done
++>>>>>>> MERGE-SOURCE
  
  
  # Check this now, so that we will NOT find the above functions in ncurses.

diff --cc configure.ac
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/termhooks.h
Simple merge

diff --cc src/window.c
index 31711718a38ea1a6996b4135c871bf0f33b816b8,b379eecabdd9d04f1bfbcc2b7a751dfad51255a3..d8e09162228189e89b2f63ed374bfb62bbdd7352
--- 1/src/window.c
--- 2/src/window.c
+++ b/src/window.c
@@@ -50,10 -53,8 +53,10 @@@ along with GNU Emacs.  If not, see <htt
  #ifdef HAVE_NS
  #include "nsterm.h"
  #endif
 -
 +#ifdef HAVE_XWIDGETS
 +#include "xwidget.h"
 +#endif
- Lisp_Object Qwindowp, Qwindow_live_p;
+ Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_valid_p;
  static Lisp_Object Qwindow_configuration_p, Qrecord_window_buffer;
  static Lisp_Object Qwindow_deletable_p, Qdelete_window, Qdisplay_buffer;
  static Lisp_Object Qreplace_buffer_in_windows, Qget_mru_window;

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge