From: Eli Zaretskii Date: Sat, 21 Jun 2014 13:41:44 +0000 (+0300) Subject: lisp/skeleton.el (skeleton-insert): Fix last change. X-Git-Tag: emacs-24.3.92~40 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=edd112b7f8956e727b21976e9e6a36256d724c24;p=emacs.git lisp/skeleton.el (skeleton-insert): Fix last change. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 148c2b0e65c..46f87253825 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-06-21 Eli Zaretskii + + * skeleton.el (skeleton-insert): Fix last change. + 2014-06-21 Fabián Ezequiel Gallina Enhancements for outline integration (bug#17796). diff --git a/lisp/skeleton.el b/lisp/skeleton.el index 027b2dd9d62..86c8ed49c74 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el @@ -200,7 +200,8 @@ not needed, a prompt-string or an expression for complex read functions. If ELEMENT is a string or a character it gets inserted (see also `skeleton-transformation-function'). Other possibilities are: - \\n if not at eol, go to next line and indent according to mode + \\n if not the last element of the skeleton, or not at eol, + go to next line and indent according to mode _ interesting point, interregion here - interesting point, no interregion interaction, overrides interesting point set by _ @@ -215,8 +216,9 @@ If ELEMENT is a string or a character it gets inserted (see also After termination, point will be positioned at the last occurrence of - or at the first occurrence of _ or at the end of the inserted text. -Note that \\n only inserts a newline if not at eol. If you want to insert -a newline unconditionally, use \"\\n\" instead. +Note that \\n as the last element of the skeleton only inserts a +newline if not at eol. If you want to unconditionally insert a newline +at the end of the skeleton, use \"\\n\" instead. Further elements can be defined via `skeleton-further-elements'. ELEMENT may itself be a SKELETON with an INTERACTOR. The user is prompted