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):

diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el
index 14646a2ab11f0bd6e872824767382bad2ed191a4..2a1ffec9fb7e409d81d3b4d3479ed450e5204040 100644 (file)
--- a/lisp/emacs-lisp/crm.el
+++ b/lisp/emacs-lisp/crm.el
@@ -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)))

diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index ccdb25ef60e59c1b4dae7d270347658c4b460680..9e239bfa3b4ae9e549d0795f4b69e9c7f8619276 100644 (file)
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -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")))

diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el
index 3ab6943608871599b4389f975133db99c134520b..a6c5ae0860e7136343b2ab59cadcf8158bc22b5e 100644 (file)
--- a/lisp/emacs-lisp/gv.el
+++ b/lisp/emacs-lisp/gv.el
@@ -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)

diff --git a/lisp/emacs-lisp/inline.el b/lisp/emacs-lisp/inline.el
index 39f8e9b59473c9c6548e73b9ba41de82c6ef4449..ffad6e8de71dc6aadead66ba08976f0de7c2b0e6 100644 (file)
--- a/lisp/emacs-lisp/inline.el
+++ b/lisp/emacs-lisp/inline.el
@@ -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)))

diff --git a/lisp/ses.el b/lisp/ses.el
index 36c966432c966ddc350e29cdb2a6a014900490e8..1509e8faa5fbe9fcb3d35cb6116cb994f89d2da7 100644 (file)
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -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)))