From: Joakim Verona <joakim@verona.se>
Date: Sun, 19 Aug 2012 00:44:11 +0000 (+0200)
Subject: upstream
X-Git-Tag: emacs-25.0.90~3284
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5436d1df5e2ba0b4d4f72b03a1cd09b20403654b;p=emacs.git

upstream
---

5436d1df5e2ba0b4d4f72b03a1cd09b20403654b
diff --cc autogen/configure
index b7cee129757,961d1acbd38..8268da38b52
--- a/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 src/window.c
index 31711718a38,b379eecabdd..d8e09162228
--- a/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;