diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/skeleton.el | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8ff7e5247e6..f93b1ad8793 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-06-26 Leo Liu <sdl.web@gmail.com> + + * skeleton.el (skeleton-end-hook): Default to nil and move the + work to skeleton-insert. (Bug#17850) + 2014-06-26 Dmitry Antipov <dmantipov@yandex.ru> * calc/calc-alg.el (math-beforep): diff --git a/lisp/skeleton.el b/lisp/skeleton.el index bb019db502c..1c6128a33a5 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el @@ -62,12 +62,8 @@ region.") "If non-nil, make sure that the skeleton inserted ends with a newline. This just influences the way the default `skeleton-end-hook' behaves.") -(defvar skeleton-end-hook - (lambda () - (or (eolp) (not skeleton-end-newline) (newline-and-indent))) +(defvar skeleton-end-hook nil "Hook called at end of skeleton but before going to point of interest. -By default this moves out anything following to next line, - unless `skeleton-end-newline' is set to nil. The variables `v1' and `v2' are still set when calling this.") @@ -268,6 +264,7 @@ When done with skeleton, but before going back to `_'-point call (mapcar #'car skeleton-further-elements) (mapcar (lambda (x) (eval (cadr x))) skeleton-further-elements) (skeleton-internal-list skeleton str)) + (or (eolp) (not skeleton-end-newline) (newline-and-indent)) (run-hooks 'skeleton-end-hook) (sit-for 0) (or (pos-visible-in-window-p beg) |