From f3953a24ea8b800170bde3db98565f2040b2f915 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 22 Jun 2014 19:59:30 +0300 Subject: [PATCH] More tweaks of skeleton documentation wrt \n behavior at bol/eol. lisp/skeleton.el (skeleton-insert): Yet another fix of the doc string wrt behavior of \n as the first/last element of a skeleton. doc/misc/autotype.texi (Skeleton Language): Document the \n feature better. --- doc/misc/ChangeLog | 5 +++++ doc/misc/autotype.texi | 7 ++++--- lisp/ChangeLog | 5 +++++ lisp/skeleton.el | 8 +++++--- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index b1d7c3a7a0c..69aa171b554 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2014-06-22 Eli Zaretskii + + * autotype.texi (Skeleton Language): Document the \n feature + better. + 2014-06-21 Eli Zaretskii * autotype.texi (Skeleton Language): Document the feature of \n diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi index dafec226d5d..3ddeb08a306 100644 --- a/doc/misc/autotype.texi +++ b/doc/misc/autotype.texi @@ -234,9 +234,10 @@ Insert string or character. Literal strings and characters are passed through @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 -line. Use newline character @code{?\n} to prevent alignment. Use -@code{"\n"} as the last string element of a skeleton to insert a -newline after the skeleton unconditionally. +line, or this is the first element and the newline would be inserted +at beginning of line. Use newline character @code{?\n} to prevent +alignment. Use @code{"\n"} as the first or last string element of a +skeleton to insert a newline unconditionally. @item @code{_} Interesting point. When wrapping skeletons around successive regions, they are put at these places. Point is left at first @code{_} where nothing is wrapped. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e0aaa182785..471b4494011 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-06-22 Eli Zaretskii + + * skeleton.el (skeleton-insert): Yet another fix of the doc string + wrt behavior of \n as the first/last element of a skeleton. + 2014-06-22 Michael Albinus * net/tramp-adb.el (tramp-adb-handle-process-file): diff --git a/lisp/skeleton.el b/lisp/skeleton.el index 86c8ed49c74..54dce9e43b7 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el @@ -200,8 +200,9 @@ 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 the last element of the skeleton, or not at eol, - go to next line and indent according to mode + \\n go to next line and indent according to mode, unless + this is the first/last element of a skeleton and point + is at bol/eol _ interesting point, interregion here - interesting point, no interregion interaction, overrides interesting point set by _ @@ -218,7 +219,8 @@ or at the first occurrence of _ or at the end of the inserted text. 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. +at the end of the skeleton, use \"\\n\" instead. Likewise with \\n +as the first element when at bol. Further elements can be defined via `skeleton-further-elements'. ELEMENT may itself be a SKELETON with an INTERACTOR. The user is prompted