Merge from origin/emacs-27

40228fffd7 (origin/emacs-27) Fix code for newline-and-indent in skele...
56c4c8ef32 * lisp/jka-compr.el (jka-compr-uninstall): Fix function re...

diff --cc lisp/jka-compr.el
index a6223646c1150800eb2923e050072f0f213989bf,f9bec722f1491f6c196b29292a381774d50656a1..2f98c8d9ff47574cbbf39d7ff531f0ffdd462106
--- 1/lisp/jka-compr.el
--- 2/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@@ -659,14 -661,14 +659,14 @@@ It is not recommended to set this varia
    "Uninstall jka-compr.
  This removes the entries in `file-name-handler-alist' and `auto-mode-alist'
  and `inhibit-local-variables-suffixes' that were added
- by `jka-compr-installed'."
+ by `jka-compr-install'."
    ;; Delete from inhibit-local-variables-suffixes what jka-compr-install added.
    (mapc
 -     (function (lambda (x)
 -               (and (jka-compr-info-strip-extension x)
 -                    (setq inhibit-local-variables-suffixes
 -                          (delete (jka-compr-info-regexp x)
 -                                  inhibit-local-variables-suffixes)))))
 +     (lambda (x)
 +       (and (jka-compr-info-strip-extension x)
 +            (setq inhibit-local-variables-suffixes
 +                  (delete (jka-compr-info-regexp x)
 +                          inhibit-local-variables-suffixes))))
       jka-compr-compression-info-list--internal)
  
    (let* ((fnha (cons nil file-name-handler-alist))