diff options
| author | Eli Zaretskii | 2014-06-21 16:41:44 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-06-21 16:41:44 +0300 |
| commit | edd112b7f8956e727b21976e9e6a36256d724c24 (patch) | |
| tree | b5d8e7f53ff9a9223b4227228fa5598758922433 | |
| parent | 4e104c767226ed34890c64230587f74d3a8aa6c0 (diff) | |
| download | emacs-edd112b7f8956e727b21976e9e6a36256d724c24.tar.gz emacs-edd112b7f8956e727b21976e9e6a36256d724c24.zip | |
lisp/skeleton.el (skeleton-insert): Fix last change.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/skeleton.el | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 148c2b0e65c..46f87253825 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-06-21 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * skeleton.el (skeleton-insert): Fix last change. | ||
| 4 | |||
| 1 | 2014-06-21 Fabián Ezequiel Gallina <fgallina@gnu.org> | 5 | 2014-06-21 Fabián Ezequiel Gallina <fgallina@gnu.org> |
| 2 | 6 | ||
| 3 | Enhancements for outline integration (bug#17796). | 7 | Enhancements for outline integration (bug#17796). |
diff --git a/lisp/skeleton.el b/lisp/skeleton.el index 027b2dd9d62..86c8ed49c74 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el | |||
| @@ -200,7 +200,8 @@ 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 at eol, go to next line and indent according to mode | 203 | \\n if not the last element of the skeleton, or not at eol, |
| 204 | go to next line and indent according to mode | ||
| 204 | _ interesting point, interregion here | 205 | _ interesting point, interregion here |
| 205 | - interesting point, no interregion interaction, overrides | 206 | - interesting point, no interregion interaction, overrides |
| 206 | interesting point set by _ | 207 | interesting point set by _ |
| @@ -215,8 +216,9 @@ If ELEMENT is a string or a character it gets inserted (see also | |||
| 215 | After termination, point will be positioned at the last occurrence of - | 216 | After termination, point will be positioned at the last occurrence of - |
| 216 | or at the first occurrence of _ or at the end of the inserted text. | 217 | or at the first occurrence of _ or at the end of the inserted text. |
| 217 | 218 | ||
| 218 | Note that \\n only inserts a newline if not at eol. If you want to insert | 219 | Note that \\n as the last element of the skeleton only inserts a |
| 219 | a newline unconditionally, use \"\\n\" instead. | 220 | newline if not at eol. If you want to unconditionally insert a newline |
| 221 | at the end of the skeleton, use \"\\n\" instead. | ||
| 220 | 222 | ||
| 221 | Further elements can be defined via `skeleton-further-elements'. | 223 | Further elements can be defined via `skeleton-further-elements'. |
| 222 | ELEMENT may itself be a SKELETON with an INTERACTOR. The user is prompted | 224 | ELEMENT may itself be a SKELETON with an INTERACTOR. The user is prompted |