aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2014-06-22 19:59:30 +0300
committerEli Zaretskii2014-06-22 19:59:30 +0300
commitf3953a24ea8b800170bde3db98565f2040b2f915 (patch)
treeb6282c9049ff5dc5cb34d779f6177742abb466f8
parent6692a64cc4c6929175c1d55a826ca35d1db3e652 (diff)
downloademacs-f3953a24ea8b800170bde3db98565f2040b2f915.tar.gz
emacs-f3953a24ea8b800170bde3db98565f2040b2f915.zip
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.
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/autotype.texi7
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/skeleton.el8
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 @@
12014-06-22 Eli Zaretskii <eliz@gnu.org>
2
3 * autotype.texi (Skeleton Language): Document the \n feature
4 better.
5
12014-06-21 Eli Zaretskii <eliz@gnu.org> 62014-06-21 Eli Zaretskii <eliz@gnu.org>
2 7
3 * autotype.texi (Skeleton Language): Document the feature of \n 8 * 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
234@c ??? something seems very wrong here. 234@c ??? something seems very wrong here.
235Insert a newline and align under current line, but not if this is the 235Insert a newline and align under current line, but not if this is the
236last element of a skeleton and the newline would be inserted at end of 236last element of a skeleton and the newline would be inserted at end of
237line. Use newline character @code{?\n} to prevent alignment. Use 237line, or this is the first element and the newline would be inserted
238@code{"\n"} as the last string element of a skeleton to insert a 238at beginning of line. Use newline character @code{?\n} to prevent
239newline after the skeleton unconditionally. 239alignment. Use @code{"\n"} as the first or last string element of a
240skeleton to insert a newline unconditionally.
240@item @code{_} 241@item @code{_}
241Interesting point. When wrapping skeletons around successive regions, they are 242Interesting point. When wrapping skeletons around successive regions, they are
242put at these places. Point is left at first @code{_} where nothing is wrapped. 243put 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 @@
12014-06-22 Eli Zaretskii <eliz@gnu.org>
2
3 * skeleton.el (skeleton-insert): Yet another fix of the doc string
4 wrt behavior of \n as the first/last element of a skeleton.
5
12014-06-22 Michael Albinus <michael.albinus@gmx.de> 62014-06-22 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp-adb.el (tramp-adb-handle-process-file): 8 * 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.
200If ELEMENT is a string or a character it gets inserted (see also 200If ELEMENT is a string or a character it gets inserted (see also
201`skeleton-transformation-function'). Other possibilities are: 201`skeleton-transformation-function'). Other possibilities are:
202 202
203 \\n if not the last element of the skeleton, or not at eol, 203 \\n go to next line and indent according to mode, unless
204 go to next line and indent according to mode 204 this is the first/last element of a skeleton and point
205 is at bol/eol
205 _ interesting point, interregion here 206 _ interesting point, interregion here
206 - interesting point, no interregion interaction, overrides 207 - interesting point, no interregion interaction, overrides
207 interesting point set by _ 208 interesting point set by _
@@ -218,7 +219,8 @@ or at the first occurrence of _ or at the end of the inserted text.
218 219
219Note that \\n as the last element of the skeleton only inserts a 220Note that \\n as the last element of the skeleton only inserts a
220newline if not at eol. If you want to unconditionally insert a newline 221newline if not at eol. If you want to unconditionally insert a newline
221at the end of the skeleton, use \"\\n\" instead. 222at the end of the skeleton, use \"\\n\" instead. Likewise with \\n
223as the first element when at bol.
222 224
223Further elements can be defined via `skeleton-further-elements'. 225Further elements can be defined via `skeleton-further-elements'.
224ELEMENT may itself be a SKELETON with an INTERACTOR. The user is prompted 226ELEMENT may itself be a SKELETON with an INTERACTOR. The user is prompted