From cbeda210835bee9ff3e7f697c7944a10db8b132c Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Sun, 31 Jan 2021 03:44:54 +0100
Subject: [PATCH 1/4] Sync latest SKK-JISYO.L

* leim/SKK-DIC/SKK-JISYO.L: Sync to current upstream version.
---
 leim/SKK-DIC/SKK-JISYO.L | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/leim/SKK-DIC/SKK-JISYO.L b/leim/SKK-DIC/SKK-JISYO.L
index 9098868caea..78d6e08027e 100644
--- a/leim/SKK-DIC/SKK-JISYO.L
+++ b/leim/SKK-DIC/SKK-JISYO.L
@@ -38109,8 +38109,8 @@ sari /
 sarin /サリン/
 sarod /サロード/サロッド/
 sars /severe acute respiratory syndrome/重症急性呼吸器症候群/
-sars-cov /severe acute respiratory syndrome coronavirus/SARSコロナウイルス
-sars-cov-2 /severe acute respiratory syndrome coronavirus 2/2019新型コロナウイルス
+sars-cov /severe acute respiratory syndrome coronavirus/SARSコロナウイルス/
+sars-cov-2 /severe acute respiratory syndrome coronavirus 2/2019新型コロナウイルス/
 sartre /サルトル/
 saruman /サルマン/
 sasa /ササ/

From 85b0137858098013eb8ab66c4e9b256eedb1954d Mon Sep 17 00:00:00 2001
From: Juri Linkov <juri@linkov.net>
Date: Sun, 31 Jan 2021 23:47:31 +0200
Subject: [PATCH 2/4] * lisp/isearch.el (isearch-lazy-highlight): Fix defcustom
 type (bug#46208)

---
 lisp/isearch.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 8320847893e..f99461ac456 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -310,7 +310,8 @@ matching the current search string is highlighted lazily
 When multiple windows display the current buffer, the
 highlighting is displayed only on the selected window, unless
 this variable is set to the symbol `all-windows'."
-  :type '(choice boolean
+  :type '(choice (const :tag "Off" nil)
+                 (const :tag "On, and applied to current window" t)
                  (const :tag "On, and applied to all windows" all-windows))
   :group 'lazy-highlight
   :group 'isearch)

From dc78f8a4ead88744c258ae712adb4fbbb65ec539 Mon Sep 17 00:00:00 2001
From: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Date: Sun, 31 Jan 2021 18:36:52 -0500
Subject: [PATCH 3/4] url-http.el: Special-case NTLM authentication

* lisp/url/url-http.el (url-http-handle-authentication): Do not
signal an error on NTLM authorization strings.  (Bug#43566)
---
 lisp/url/url-http.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index b4d7d333f34..473da6f84c9 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -461,8 +461,10 @@ Return the number of characters removed."
     ;; headers, then this means that we've already tried sending
     ;; credentials to the server, and they were wrong, so just give
     ;; up.
-    (when (assoc "Authorization" url-http-extra-headers)
-      (error "Wrong authorization used for %s" url))
+    (let ((authorization (assoc "Authorization" url-http-extra-headers)))
+      (when (and authorization
+		 (not (string-match "^NTLM " (cdr authorization))))
+	(error "Wrong authorization used for %s" url)))
 
     ;; find strongest supported auth
     (dolist (this-auth auths)

From 7355209f53e1c7f383a1df8b5e294ec9f43ab82e Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 2 Feb 2021 18:25:31 +0200
Subject: [PATCH 4/4] * lisp/window.el (recenter-top-bottom): Clarify doc
 string.

---
 lisp/window.el | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lisp/window.el b/lisp/window.el
index f388f863725..95db01bca48 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -9545,13 +9545,16 @@ cycling order is middle -> top -> bottom."
   :group 'windows)
 
 (defun recenter-top-bottom (&optional arg)
-  "Move current buffer line to the specified window line.
-With no prefix argument, successive calls place point according
-to the cycling order defined by `recenter-positions'.
+  "Scroll the window so that current line is in the middle of the window.
+Successive invocations scroll the window in a cyclical order to put
+the current line at certain places within the window, as determined by
+`recenter-positions'.  By default, the second invocation puts the
+current line at the top-most window line, the third invocation puts it
+on the bottom-most window line, and then the order is reused in a
+cyclical manner.
 
-A prefix argument is handled like `recenter':
- With numeric prefix ARG, move current line to window-line ARG.
- With plain `C-u', move current line to window center."
+With numeric prefix ARG, move current line ARG lines below the window top.
+With plain \\[universal-argument], move current line to window center."
   (interactive "P")
   (cond
    (arg (recenter arg t))                 ; Always respect ARG.