diff options
Diffstat (limited to 'lisp/skeleton.el')
| -rw-r--r-- | lisp/skeleton.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/skeleton.el b/lisp/skeleton.el index 48491e43cae..c363fb2c489 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el @@ -104,10 +104,10 @@ are integer buffer positions in the reverse order of the insertion order.") (defvar skeleton-point) (defvar skeleton-regions) -(def-edebug-spec skeleton-edebug-spec - ([&or null stringp (stringp &rest stringp) [[¬ atom] sexp]] - &rest &or "n" "_" "-" ">" "@" "&" "!" "|" "resume:" - ("quote" def-form) skeleton-edebug-spec def-form)) +(def-edebug-elem-spec 'skeleton-edebug-spec + '([&or null stringp (stringp &rest stringp) [[¬ atom] sexp]] + &rest &or "n" "_" "-" ">" "@" "&" "!" "|" "resume:" + ("quote" def-form) skeleton-edebug-spec def-form)) ;;;###autoload (defmacro define-skeleton (command documentation &rest skeleton) "Define a user-configurable COMMAND that enters a statement skeleton. @@ -290,7 +290,8 @@ i.e. we are handling the iterator of a subskeleton, returns empty string if user didn't modify input. While reading, the value of `minibuffer-help-form' is variable `help' if that is non-nil or a default string." - (let ((minibuffer-help-form (or (if (boundp 'help) (symbol-value 'help)) + (with-suppressed-warnings ((lexical help)) (defvar help)) ;FIXME: Prefix! + (let ((minibuffer-help-form (or (bound-and-true-p help) (if recursive "\ As long as you provide input you will insert another subskeleton. |