summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2014-06-21 11:01:52 +0300
committerEli Zaretskii <eliz@gnu.org>2014-06-21 11:01:52 +0300
commit900f9384095f8e968e6149e72568e0547dc0d587 (patch)
tree72770280c4bee6f08c6f53037e80037141e9b1fd
parentd895e63e96baf3f5ae1fdb32dafc65f0031bd610 (diff)
downloademacs-900f9384095f8e968e6149e72568e0547dc0d587.tar.gz
lisp/skeleton.el (skeleton-insert): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/skeleton.el5
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 46e3b0f6321..b693e077f76 100644
--- 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 21f00d16c82..027b2dd9d62 100644
--- 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