ustream

diff --cc autogen/configure
index 09be481ee0a99061a84201df37796db437dc1e6c,a83a6bda55c87572e253a096ce9a0fa58f2515fa..51c16695205cc1f52520d9931dc1d5354f9b71d7
--- 1/autogen/configure
--- 2/autogen/configure
+++ b/autogen/configure
@@@ -663,8 -614,14 +663,15 @@@ gl_GNULIB_ENABLED_verify_FALS
  gl_GNULIB_ENABLED_verify_TRUE
  gl_GNULIB_ENABLED_strtoull_FALSE
  gl_GNULIB_ENABLED_strtoull_TRUE
 -gl_GNULIB_ENABLED_strtoll_FALSE
 -gl_GNULIB_ENABLED_strtoll_TRUE
  gl_GNULIB_ENABLED_stat_FALSE
  gl_GNULIB_ENABLED_stat_TRUE
++<<<<<<< TREE
++=======
+ gl_GNULIB_ENABLED_sigprocmask_FALSE
+ gl_GNULIB_ENABLED_sigprocmask_TRUE
+ gl_GNULIB_ENABLED_pathmax_FALSE
+ gl_GNULIB_ENABLED_pathmax_TRUE
++>>>>>>> MERGE-SOURCE
  gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_FALSE
  gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE
  gl_GNULIB_ENABLED_dosname_FALSE
@@@ -7019,15 -6960,11 +7026,16 @@@ esa
    # Code from module lstat:
    # Code from module mktime:
    # Code from module multiarch:
 +<<<<<<< TREE
 +=======
    # Code from module nocrash:
+   # Code from module pathmax:
    # Code from module pthread_sigmask:
 +>>>>>>> MERGE-SOURCE
    # Code from module readlink:
 -  # Code from module signal-h:
 +<<<<<<< TREE
 +=======
 +  # Code from module signal:
    # Code from module sigprocmask:
    # Code from module snippet/_Noreturn:
    # Code from module snippet/arg-nonnull:
@@@ -21898,7 -21817,10 +21918,12 @@@ $as_echo "$gl_cv_next_unistd_h" >&6; 
  
    gl_gnulib_enabled_dosname=false
    gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false
++<<<<<<< TREE
++=======
+   gl_gnulib_enabled_pathmax=false
+   gl_gnulib_enabled_sigprocmask=false
++>>>>>>> MERGE-SOURCE
    gl_gnulib_enabled_stat=false
 -  gl_gnulib_enabled_strtoll=false
    gl_gnulib_enabled_strtoull=false
    gl_gnulib_enabled_verify=false
    func_gl_gnulib_m4code_dosname ()
@@@ -21915,8 -21837,15 +21940,20 @@@
        gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=true
      fi
    }
 +<<<<<<< TREE
++<<<<<<< TREE
 +=======
++=======
+   func_gl_gnulib_m4code_pathmax ()
+   {
+     if ! $gl_gnulib_enabled_pathmax; then
+ 
+ 
+ 
+       gl_gnulib_enabled_pathmax=true
+     fi
+   }
++>>>>>>> MERGE-SOURCE
    func_gl_gnulib_m4code_sigprocmask ()
    {
      if ! $gl_gnulib_enabled_sigprocmask; then
@@@ -22094,11 -22024,10 +22131,17 @@@ f
        if test $REPLACE_STAT = 1; then
          func_gl_gnulib_m4code_dosname
        fi
 +<<<<<<< TREE
 +      if $condition; then
 +=======
        if test $REPLACE_STAT = 1; then
++<<<<<<< TREE
++>>>>>>> MERGE-SOURCE
++=======
+         func_gl_gnulib_m4code_pathmax
+       fi
+       if test $REPLACE_STAT = 1; then
 +>>>>>>> MERGE-SOURCE
          func_gl_gnulib_m4code_verify
        fi
      fi
@@@ -22261,6 -22186,22 +22304,25 @@@ els
    gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_FALSE=
  fi
  
++<<<<<<< TREE
++=======
+    if $gl_gnulib_enabled_pathmax; then
+   gl_GNULIB_ENABLED_pathmax_TRUE=
+   gl_GNULIB_ENABLED_pathmax_FALSE='#'
+ else
+   gl_GNULIB_ENABLED_pathmax_TRUE='#'
+   gl_GNULIB_ENABLED_pathmax_FALSE=
+ fi
+ 
+    if $gl_gnulib_enabled_sigprocmask; then
+   gl_GNULIB_ENABLED_sigprocmask_TRUE=
+   gl_GNULIB_ENABLED_sigprocmask_FALSE='#'
+ else
+   gl_GNULIB_ENABLED_sigprocmask_TRUE='#'
+   gl_GNULIB_ENABLED_sigprocmask_FALSE=
+ fi
+ 
++>>>>>>> MERGE-SOURCE
     if $gl_gnulib_enabled_stat; then
    gl_GNULIB_ENABLED_stat_TRUE=
    gl_GNULIB_ENABLED_stat_FALSE='#'
@@@ -24502,8 -22692,10 +24564,15 @@@ if test -z "${gl_GNULIB_ENABLED_be453ce
    as_fn_error "conditional \"gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
 +<<<<<<< TREE
++<<<<<<< TREE
++=======
 +=======
+ if test -z "${gl_GNULIB_ENABLED_pathmax_TRUE}" && test -z "${gl_GNULIB_ENABLED_pathmax_FALSE}"; then
+   as_fn_error "conditional \"gl_GNULIB_ENABLED_pathmax\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++>>>>>>> MERGE-SOURCE
  if test -z "${gl_GNULIB_ENABLED_sigprocmask_TRUE}" && test -z "${gl_GNULIB_ENABLED_sigprocmask_FALSE}"; then
    as_fn_error "conditional \"gl_GNULIB_ENABLED_sigprocmask\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5

diff --cc configure.in
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge