From: Glenn Morris Date: Tue, 4 May 2021 14:50:28 +0000 (-0700) Subject: Merge from origin/emacs-27 X-Git-Tag: emacs-28.0.90~2616 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0c993ed1d3af6320a8aec6e94c0537bc62948701;p=emacs.git 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... --- 0c993ed1d3af6320a8aec6e94c0537bc62948701 diff --cc lisp/jka-compr.el index a6223646c11,f9bec722f14..2f98c8d9ff4 --- a/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))