Commit 2454874e authored by Leo Liu's avatar Leo Liu
Browse files

* skeleton.el (skeleton-end-hook): Default to nil and move the

work to skeleton-insert.

Fixes: debbugs:17850
parent dceff1c1
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):
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment