mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-31 20:02:42 +00:00
Code Issues Releases Activity

Merge from origin/emacs-27

Browse Source 
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
This commit is contained in:
Glenn Morris 2021-02-03 08:11:08 -08:00
commit bd5b4b35bc
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
leim/SKK-DIC/SKK-JISYO.L
View File

Binary file not shown.

3
lisp/isearch.el
View File

@ -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)

6
lisp/url/url-http.el
View File

@ -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)

15
lisp/window.el
View File

@ -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'.
"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.