mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-16 17:24:23 +00:00
Fix some &rest body edebug specs
* lisp/ses.el (ses--letref): * lisp/emacs-lisp/crm.el (crm--completion-command): Fix edebug &rest body spec (bug#28747). * lisp/emacs-lisp/easy-mmode.el (easy-mmode-define-navigation): * lisp/emacs-lisp/inline.el (inline--leteval) (inline--letlisteval, inline-letevals):
This commit is contained in:
parent
7fd1093d28
commit
a1dbb81f18
5 changed files with 7 additions and 7 deletions
|
|
@ -154,7 +154,7 @@ Return the element's boundaries as (START . END)."
|
|||
|
||||
(defmacro crm--completion-command (beg end &rest body)
|
||||
"Run BODY with BEG and END bound to the current element's boundaries."
|
||||
(declare (indent 2) (debug (sexp sexp &rest body)))
|
||||
(declare (indent 2) (debug (sexp sexp body)))
|
||||
`(let* ((crm--boundaries (crm--current-element))
|
||||
(,beg (car crm--boundaries))
|
||||
(,end (cdr crm--boundaries)))
|
||||
|
|
|
|||
|
|
@ -626,7 +626,7 @@ ENDFUN should return the end position (with or without moving point).
|
|||
NARROWFUN non-nil means to check for narrowing before moving, and if
|
||||
found, do `widen' first and then call NARROWFUN with no args after moving.
|
||||
BODY is executed after moving to the destination location."
|
||||
(declare (indent 5) (debug (exp exp exp def-form def-form &rest def-body)))
|
||||
(declare (indent 5) (debug (exp exp exp def-form def-form def-body)))
|
||||
(let* ((base-name (symbol-name base))
|
||||
(prev-sym (intern (concat base-name "-prev")))
|
||||
(next-sym (intern (concat base-name "-next")))
|
||||
|
|
|
|||
|
|
@ -568,7 +568,7 @@ REF must have been previously obtained with `gv-ref'."
|
|||
(gv-define-setter gv-deref (v ref) `(funcall (cdr ,ref) ,v))
|
||||
|
||||
;; (defmacro gv-letref (vars place &rest body)
|
||||
;; (declare (indent 2) (debug (sexp form &rest body)))
|
||||
;; (declare (indent 2) (debug (sexp form body)))
|
||||
;; (require 'cl-lib) ;Can't require cl-lib at top-level for bootstrap reasons!
|
||||
;; (gv-letplace (getter setter) place
|
||||
;; `(cl-macrolet ((,(nth 0 vars) () ',getter)
|
||||
|
|
|
|||
|
|
@ -90,12 +90,12 @@
|
|||
(error "inline-error can only be used within define-inline"))
|
||||
|
||||
(defmacro inline--leteval (_var-exp &rest _body)
|
||||
(declare (indent 1) (debug (sexp &rest body)))
|
||||
(declare (indent 1) (debug (sexp body)))
|
||||
;; BEWARE: if we're here it's presumably via macro-expansion of
|
||||
;; inline-letevals, so signal the error in terms of the user's code.
|
||||
(error "inline-letevals can only be used within define-inline"))
|
||||
(defmacro inline--letlisteval (_list &rest _body)
|
||||
(declare (indent 1) (debug (sexp &rest body)))
|
||||
(declare (indent 1) (debug (sexp body)))
|
||||
;; BEWARE: if we're here it's presumably via macro-expansion of
|
||||
;; inline-letevals, so signal the error in terms of the user's code.
|
||||
(error "inline-letevals can only be used within define-inline"))
|
||||
|
|
@ -110,7 +110,7 @@ of arguments, in which case each argument is evaluated and the resulting
|
|||
new list is re-bound to VAR.
|
||||
|
||||
After VARS is handled, BODY is evaluated in the new environment."
|
||||
(declare (indent 1) (debug (sexp &rest form)))
|
||||
(declare (indent 1) (debug (sexp body)))
|
||||
(cond
|
||||
((consp vars)
|
||||
`(inline--leteval ,(pop vars) (inline-letevals ,vars ,@body)))
|
||||
|
|
|
|||
|
|
@ -506,7 +506,7 @@ This can alter PLIST."
|
|||
(setplist name (ses-plist-delq (symbol-plist name) 'ses-cell))) ))
|
||||
|
||||
(defmacro ses--letref (vars place &rest body)
|
||||
(declare (indent 2) (debug (sexp form &rest body)))
|
||||
(declare (indent 2) (debug (sexp form body)))
|
||||
(gv-letplace (getter setter) place
|
||||
`(cl-macrolet ((,(nth 0 vars) () ',getter)
|
||||
(,(nth 1 vars) (v) (funcall ',setter v)))
|
||||
|
|
|
|||
Loading…
Reference in a new issue