diff options
| author | Lars Ingebrigtsen | 2019-10-16 04:44:22 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-10-16 04:44:22 +0200 |
| commit | a1dbb81f1808194da1b3f2af29beef704dcd1f5a (patch) | |
| tree | e11356d175bea8c289b92008cc9bcc5e4c8f56de | |
| parent | 7fd1093d28e8be4683f45000fa9c0440cbe8182c (diff) | |
| download | emacs-a1dbb81f1808194da1b3f2af29beef704dcd1f5a.tar.gz emacs-a1dbb81f1808194da1b3f2af29beef704dcd1f5a.zip | |
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):
| -rw-r--r-- | lisp/emacs-lisp/crm.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/easy-mmode.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/gv.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/inline.el | 6 | ||||
| -rw-r--r-- | lisp/ses.el | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el index 14646a2ab11..2a1ffec9fb7 100644 --- a/lisp/emacs-lisp/crm.el +++ b/lisp/emacs-lisp/crm.el | |||
| @@ -154,7 +154,7 @@ Return the element's boundaries as (START . END)." | |||
| 154 | 154 | ||
| 155 | (defmacro crm--completion-command (beg end &rest body) | 155 | (defmacro crm--completion-command (beg end &rest body) |
| 156 | "Run BODY with BEG and END bound to the current element's boundaries." | 156 | "Run BODY with BEG and END bound to the current element's boundaries." |
| 157 | (declare (indent 2) (debug (sexp sexp &rest body))) | 157 | (declare (indent 2) (debug (sexp sexp body))) |
| 158 | `(let* ((crm--boundaries (crm--current-element)) | 158 | `(let* ((crm--boundaries (crm--current-element)) |
| 159 | (,beg (car crm--boundaries)) | 159 | (,beg (car crm--boundaries)) |
| 160 | (,end (cdr crm--boundaries))) | 160 | (,end (cdr crm--boundaries))) |
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index ccdb25ef60e..9e239bfa3b4 100644 --- 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). | |||
| 626 | NARROWFUN non-nil means to check for narrowing before moving, and if | 626 | NARROWFUN non-nil means to check for narrowing before moving, and if |
| 627 | found, do `widen' first and then call NARROWFUN with no args after moving. | 627 | found, do `widen' first and then call NARROWFUN with no args after moving. |
| 628 | BODY is executed after moving to the destination location." | 628 | BODY is executed after moving to the destination location." |
| 629 | (declare (indent 5) (debug (exp exp exp def-form def-form &rest def-body))) | 629 | (declare (indent 5) (debug (exp exp exp def-form def-form def-body))) |
| 630 | (let* ((base-name (symbol-name base)) | 630 | (let* ((base-name (symbol-name base)) |
| 631 | (prev-sym (intern (concat base-name "-prev"))) | 631 | (prev-sym (intern (concat base-name "-prev"))) |
| 632 | (next-sym (intern (concat base-name "-next"))) | 632 | (next-sym (intern (concat base-name "-next"))) |
diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el index 3ab69436088..a6c5ae0860e 100644 --- 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'." | |||
| 568 | (gv-define-setter gv-deref (v ref) `(funcall (cdr ,ref) ,v)) | 568 | (gv-define-setter gv-deref (v ref) `(funcall (cdr ,ref) ,v)) |
| 569 | 569 | ||
| 570 | ;; (defmacro gv-letref (vars place &rest body) | 570 | ;; (defmacro gv-letref (vars place &rest body) |
| 571 | ;; (declare (indent 2) (debug (sexp form &rest body))) | 571 | ;; (declare (indent 2) (debug (sexp form body))) |
| 572 | ;; (require 'cl-lib) ;Can't require cl-lib at top-level for bootstrap reasons! | 572 | ;; (require 'cl-lib) ;Can't require cl-lib at top-level for bootstrap reasons! |
| 573 | ;; (gv-letplace (getter setter) place | 573 | ;; (gv-letplace (getter setter) place |
| 574 | ;; `(cl-macrolet ((,(nth 0 vars) () ',getter) | 574 | ;; `(cl-macrolet ((,(nth 0 vars) () ',getter) |
diff --git a/lisp/emacs-lisp/inline.el b/lisp/emacs-lisp/inline.el index 39f8e9b5947..ffad6e8de71 100644 --- a/lisp/emacs-lisp/inline.el +++ b/lisp/emacs-lisp/inline.el | |||
| @@ -90,12 +90,12 @@ | |||
| 90 | (error "inline-error can only be used within define-inline")) | 90 | (error "inline-error can only be used within define-inline")) |
| 91 | 91 | ||
| 92 | (defmacro inline--leteval (_var-exp &rest _body) | 92 | (defmacro inline--leteval (_var-exp &rest _body) |
| 93 | (declare (indent 1) (debug (sexp &rest body))) | 93 | (declare (indent 1) (debug (sexp body))) |
| 94 | ;; BEWARE: if we're here it's presumably via macro-expansion of | 94 | ;; BEWARE: if we're here it's presumably via macro-expansion of |
| 95 | ;; inline-letevals, so signal the error in terms of the user's code. | 95 | ;; inline-letevals, so signal the error in terms of the user's code. |
| 96 | (error "inline-letevals can only be used within define-inline")) | 96 | (error "inline-letevals can only be used within define-inline")) |
| 97 | (defmacro inline--letlisteval (_list &rest _body) | 97 | (defmacro inline--letlisteval (_list &rest _body) |
| 98 | (declare (indent 1) (debug (sexp &rest body))) | 98 | (declare (indent 1) (debug (sexp body))) |
| 99 | ;; BEWARE: if we're here it's presumably via macro-expansion of | 99 | ;; BEWARE: if we're here it's presumably via macro-expansion of |
| 100 | ;; inline-letevals, so signal the error in terms of the user's code. | 100 | ;; inline-letevals, so signal the error in terms of the user's code. |
| 101 | (error "inline-letevals can only be used within define-inline")) | 101 | (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 | |||
| 110 | new list is re-bound to VAR. | 110 | new list is re-bound to VAR. |
| 111 | 111 | ||
| 112 | After VARS is handled, BODY is evaluated in the new environment." | 112 | After VARS is handled, BODY is evaluated in the new environment." |
| 113 | (declare (indent 1) (debug (sexp &rest form))) | 113 | (declare (indent 1) (debug (sexp body))) |
| 114 | (cond | 114 | (cond |
| 115 | ((consp vars) | 115 | ((consp vars) |
| 116 | `(inline--leteval ,(pop vars) (inline-letevals ,vars ,@body))) | 116 | `(inline--leteval ,(pop vars) (inline-letevals ,vars ,@body))) |
diff --git a/lisp/ses.el b/lisp/ses.el index 36c966432c9..1509e8faa5f 100644 --- a/lisp/ses.el +++ b/lisp/ses.el | |||
| @@ -506,7 +506,7 @@ This can alter PLIST." | |||
| 506 | (setplist name (ses-plist-delq (symbol-plist name) 'ses-cell))) )) | 506 | (setplist name (ses-plist-delq (symbol-plist name) 'ses-cell))) )) |
| 507 | 507 | ||
| 508 | (defmacro ses--letref (vars place &rest body) | 508 | (defmacro ses--letref (vars place &rest body) |
| 509 | (declare (indent 2) (debug (sexp form &rest body))) | 509 | (declare (indent 2) (debug (sexp form body))) |
| 510 | (gv-letplace (getter setter) place | 510 | (gv-letplace (getter setter) place |
| 511 | `(cl-macrolet ((,(nth 0 vars) () ',getter) | 511 | `(cl-macrolet ((,(nth 0 vars) () ',getter) |
| 512 | (,(nth 1 vars) (v) (funcall ',setter v))) | 512 | (,(nth 1 vars) (v) (funcall ',setter v))) |