Merge from origin/emacs-27

7355209f53 (origin/emacs-27) * lisp/window.el (recenter-top-bottom): ...
dc78f8a4ea (emacs-27) url-http.el: Special-case NTLM authentication
85b0137858 * lisp/isearch.el (isearch-lazy-highlight): Fix defcustom ...
cbeda21083 Sync latest SKK-JISYO.L

4 files changed, 18 insertions, 12 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 /ササ/
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 82d64c5766b..b58ca8a6f70 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -320,7 +320,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)
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 61e07a0d9ca..8cebd4e79f6 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)
diff --git a/lisp/window.el b/lisp/window.el
index 8905d4a826e..92ed6ee0921 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -9733,13 +9733,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'.
-
-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."
+  "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.
+
+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.