lisp/skeleton.el (skeleton-insert): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 46e3b0f63210040927c5e66d59d434cfe44515c2..b693e077f76d3e9ab06864b5a86790f706bb2d79 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-21  Eli Zaretskii  <eliz@gnu.org>
+
+       * skeleton.el (skeleton-insert): Doc fix.
+
 2014-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/smie.el (smie-config--guess): Fix typo.

diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 21f00d16c826fd97e19597fdd44981f8039c36da..027b2dd9d62203f89e27fd800bf8ee4e4244a6b2 100644 (file)
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -200,7 +200,7 @@ 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     go to next line and indent according to mode
+       \\n     if 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,6 +215,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.
+
 Further elements can be defined via `skeleton-further-elements'.
 ELEMENT may itself be a SKELETON with an INTERACTOR.  The user is prompted
 repeatedly for different inputs.  The SKELETON is processed as often as