diff options
Diffstat (limited to 'lisp/skeleton.el')
| -rw-r--r-- | lisp/skeleton.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/skeleton.el b/lisp/skeleton.el index 0e81e2d74c6..c563a9cd0cd 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el | |||
| @@ -59,8 +59,7 @@ region.") | |||
| 59 | (make-obsolete-variable 'skeleton-autowrap nil "24.5") | 59 | (make-obsolete-variable 'skeleton-autowrap nil "24.5") |
| 60 | 60 | ||
| 61 | (defvar skeleton-end-newline t | 61 | (defvar skeleton-end-newline t |
| 62 | "If non-nil, make sure that the skeleton inserted ends with a newline. | 62 | "If non-nil, make sure that the skeleton inserted ends with a newline.") |
| 63 | This just influences the way the default `skeleton-end-hook' behaves.") | ||
| 64 | 63 | ||
| 65 | (defvar skeleton-end-hook nil | 64 | (defvar skeleton-end-hook nil |
| 66 | "Hook called at end of skeleton but before going to point of interest. | 65 | "Hook called at end of skeleton but before going to point of interest. |
| @@ -187,6 +186,10 @@ The optional third argument STR, if specified, is the value for the | |||
| 187 | variable `str' within the skeleton. When this is non-nil, the | 186 | variable `str' within the skeleton. When this is non-nil, the |
| 188 | interactor gets ignored, and this should be a valid skeleton element. | 187 | interactor gets ignored, and this should be a valid skeleton element. |
| 189 | 188 | ||
| 189 | When done with skeleton, but before going back to `_'-point, add | ||
| 190 | a newline (unless `skeleton-end-newline' is nil) and run the hook | ||
| 191 | `skeleton-end-hook'. | ||
| 192 | |||
| 190 | SKELETON is made up as (INTERACTOR ELEMENT ...). INTERACTOR may be nil if | 193 | SKELETON is made up as (INTERACTOR ELEMENT ...). INTERACTOR may be nil if |
| 191 | not needed, a prompt-string or an expression for complex read functions. | 194 | not needed, a prompt-string or an expression for complex read functions. |
| 192 | 195 | ||
| @@ -235,10 +238,7 @@ available: | |||
| 235 | then: insert previously read string once more | 238 | then: insert previously read string once more |
| 236 | help help-form during interaction with the user or nil | 239 | help help-form during interaction with the user or nil |
| 237 | input initial input (string or cons with index) while reading str | 240 | input initial input (string or cons with index) while reading str |
| 238 | v1, v2 local variables for memorizing anything you want | 241 | v1, v2 local variables for memorizing anything you want" |
| 239 | |||
| 240 | When done with skeleton, but before going back to `_'-point call | ||
| 241 | `skeleton-end-hook' if that is non-nil." | ||
| 242 | (let ((skeleton-regions regions)) | 242 | (let ((skeleton-regions regions)) |
| 243 | (and skeleton-regions | 243 | (and skeleton-regions |
| 244 | (setq skeleton-regions | 244 | (setq skeleton-regions |