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...
This commit is contained in:
Glenn Morris 2021-05-04 07:50:28 -07:00
commit 0c993ed1d3
2 changed files with 2 additions and 2 deletions

View file

@ -579,7 +579,7 @@ table:
@vindex skeleton-transformation
Insert string or character. Literal strings and characters are passed through
@code{skeleton-transformation} when that is non-@code{nil}.
@item @code{?\n}
@item @code{\n}
@c ??? something seems very wrong here.
Insert a newline and align under current line, but not if this is the
last element of a skeleton and the newline would be inserted at end of

View file

@ -659,7 +659,7 @@ It is not recommended to set this variable permanently to anything but nil.")
"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
(lambda (x)