4 files changed, 28 insertions, 10 deletions

diff --git a/src/gmalloc.c b/src/gmalloc.c
index 2bda95ebd3d..a17d39c1eeb 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -1502,17 +1502,18 @@ extern void *__sbrk (ptrdiff_t increment);
 static void *
 gdefault_morecore (ptrdiff_t increment)
 {
-  void *result;
 #ifdef HYBRID_MALLOC
   if (!DUMPED)
     {
       return bss_sbrk (increment);
     }
 #endif
-  result = (void *) __sbrk (increment);
-  if (result == (void *) -1)
-    return NULL;
-  return result;
+#ifdef HAVE_SBRK
+  void *result = (void *) __sbrk (increment);
+  if (result != (void *) -1)
+    return result;
+#endif
+  return NULL;
 }
 
 void *(*__morecore) (ptrdiff_t) = gdefault_morecore;
diff --git a/src/gnutls.c b/src/gnutls.c
index 36f65c4acb3..85cebd0e1c6 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -2422,6 +2422,8 @@ GnuTLS AEAD ciphers     : the list will contain `AEAD-ciphers'.  */)
 
 #ifdef HAVE_GNUTLS
 
+  capabilities = Fcons (intern("gnutls"), capabilities);
+
 # ifdef HAVE_GNUTLS3
   capabilities = Fcons (intern("gnutls3"), capabilities);
   capabilities = Fcons (intern("digests"), capabilities);
diff --git a/src/window.c b/src/window.c
index 9bb2c43a698..cc1d2a7b36e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6661,7 +6661,7 @@ the return value is nil.  Otherwise the value is t.  */)
 
            We have to do this in order to capture the following
            scenario: Suppose our frame contains two live windows W1 and
-           W2 and ‘set-window-configuration’ replaces them by two
+           W2 and 'set-window-configuration' replaces them by two
            windows W3 and W4 that were dead the last time
            run_window_size_change_functions was run.  If W3 and W4 have
            the same values for their old and new pixel sizes but these
@@ -7617,8 +7617,8 @@ on their symbols to be controlled by this variable.  */);
   DEFVAR_LISP ("window-configuration-change-hook",
                Vwindow_configuration_change_hook,
                doc: /* Functions to call when window configuration changes.
-The buffer-local part is run once per window, with the relevant window
-selected; while the global part is run only once for the modified frame,
+The buffer-local value is run once per window, with the relevant window
+selected; while the global value is run only once for the modified frame,
 with the relevant frame selected.  */);
   Vwindow_configuration_change_hook = Qnil;
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 900a8dc1637..f1a6c622d09 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13174,8 +13174,20 @@ hscroll_window_tree (Lisp_Object window)
 
           /* If the position of this window's point has explicitly
              changed, no more suspend auto hscrolling.  */
-          if (NILP (Fequal (Fwindow_point (window), Fwindow_old_point (window))))
-            w->suspend_auto_hscroll = false;
+          if (w->suspend_auto_hscroll
+              && NILP (Fequal (Fwindow_point (window),
+                               Fwindow_old_point (window))))
+            {
+              w->suspend_auto_hscroll = false;
+              /* When hscrolling just the current line, and the rest
+                 of lines were temporarily hscrolled, but no longer
+                 are, force thorough redisplay of this window, to show
+                 the effect of disabling hscroll suspension immediately.  */
+              if (w->min_hscroll == 0 && w->hscroll > 0
+                  && EQ (Fbuffer_local_value (Qauto_hscroll_mode, w->contents),
+                         Qcurrent_line))
+                SET_FRAME_GARBAGED (XFRAME (w->frame));
+            }
 
           /* Remember window point.  */
           Fset_marker (w->old_pointm,
@@ -32563,6 +32575,9 @@ display-start position.
 These functions are called whenever the `window-start' marker is modified,
 either to point into another buffer (e.g. via `set-window-buffer') or another
 place in the same buffer.
+When each function is called, the `window-start' marker of its window
+argument has been already set to the new value, and the buffer which that
+window will display is set to be the current buffer.
 Note that the value of `window-end' is not valid when these functions are
 called.