diff options
| author | Eli Zaretskii | 2014-06-22 19:59:30 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-06-22 19:59:30 +0300 |
| commit | f3953a24ea8b800170bde3db98565f2040b2f915 (patch) | |
| tree | b6282c9049ff5dc5cb34d779f6177742abb466f8 | |
| parent | 6692a64cc4c6929175c1d55a826ca35d1db3e652 (diff) | |
| download | emacs-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/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/misc/autotype.texi | 7 | ||||
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2014-06-22 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * autotype.texi (Skeleton Language): Document the \n feature | ||
| 4 | better. | ||
| 5 | |||
| 1 | 2014-06-21 Eli Zaretskii <eliz@gnu.org> | 6 | 2014-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. |
| 235 | Insert a newline and align under current line, but not if this is the | 235 | Insert a newline and align under current line, but not if this is the |
| 236 | last element of a skeleton and the newline would be inserted at end of | 236 | last element of a skeleton and the newline would be inserted at end of |
| 237 | line. Use newline character @code{?\n} to prevent alignment. Use | 237 | line, 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 | 238 | at beginning of line. Use newline character @code{?\n} to prevent |
| 239 | newline after the skeleton unconditionally. | 239 | alignment. Use @code{"\n"} as the first or last string element of a |
| 240 | skeleton to insert a newline unconditionally. | ||
| 240 | @item @code{_} | 241 | @item @code{_} |
| 241 | Interesting point. When wrapping skeletons around successive regions, they are | 242 | Interesting point. When wrapping skeletons around successive regions, they are |
| 242 | put at these places. Point is left at first @code{_} where nothing is wrapped. | 243 | 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 @@ | |||
| 1 | 2014-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 | |||
| 1 | 2014-06-22 Michael Albinus <michael.albinus@gmx.de> | 6 | 2014-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. | |||
| 200 | If ELEMENT is a string or a character it gets inserted (see also | 200 | If 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 | ||
| 219 | Note that \\n as the last element of the skeleton only inserts a | 220 | Note that \\n as the last element of the skeleton only inserts a |
| 220 | newline if not at eol. If you want to unconditionally insert a newline | 221 | newline if not at eol. If you want to unconditionally insert a newline |
| 221 | at the end of the skeleton, use \"\\n\" instead. | 222 | at the end of the skeleton, use \"\\n\" instead. Likewise with \\n |
| 223 | as the first element when at bol. | ||
| 222 | 224 | ||
| 223 | Further elements can be defined via `skeleton-further-elements'. | 225 | Further elements can be defined via `skeleton-further-elements'. |
| 224 | ELEMENT may itself be a SKELETON with an INTERACTOR. The user is prompted | 226 | ELEMENT may itself be a SKELETON with an INTERACTOR. The user is prompted |