diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-06-11 18:37:47 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-06-11 18:37:47 +0200 |
| commit | a6cc16d04ca98bcf38c7ebf4d0c5bf68b6b37369 (patch) | |
| tree | 4178fe7df40a89e33139d70559f89506d2fe8e8a /lisp/emacs-lisp | |
| parent | ab78ed83b977084885265a1842e4e474e0938d9f (diff) | |
| parent | d8a6d2e4810a4072cabbf76170dc4bf708f27d10 (diff) | |
| download | emacs-a6cc16d04ca98bcf38c7ebf4d0c5bf68b6b37369.tar.gz emacs-a6cc16d04ca98bcf38c7ebf4d0c5bf68b6b37369.tar.bz2 emacs-a6cc16d04ca98bcf38c7ebf4d0c5bf68b6b37369.zip | |
Merge remote-tracking branch 'savahnna/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 3317c580028..a3e72c4b00d 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -199,7 +199,7 @@ The name is made by appending a number to PREFIX, default \"T\"." [&optional ["&key" [cl-&key-arg &rest cl-&key-arg] &optional "&allow-other-keys"]] [&optional ["&aux" &rest - &or (symbolp &optional def-form) symbolp]] + &or (cl-lambda-arg &optional def-form) arg]] . [&or arg nil]))) (def-edebug-spec cl-&optional-arg @@ -219,7 +219,7 @@ The name is made by appending a number to PREFIX, default \"T\"." [&optional ["&key" cl-&key-arg &rest cl-&key-arg &optional "&allow-other-keys"]] [&optional ["&aux" &rest - &or (symbolp &optional def-form) symbolp]] + &or (cl-lambda-arg &optional def-form) arg]] . [&or arg nil]))) (def-edebug-spec cl-type-spec sexp) @@ -402,7 +402,7 @@ and BODY is implicitly surrounded by (cl-block NAME ...). arg]] &optional "&allow-other-keys"]] [&optional ["&aux" &rest - &or (symbolp &optional def-form) symbolp]] + &or (cl-macro-arg &optional def-form) arg]] [&optional "&environment" arg] ))) @@ -421,7 +421,7 @@ and BODY is implicitly surrounded by (cl-block NAME ...). arg]] &optional "&allow-other-keys"]] [&optional ["&aux" &rest - &or (symbolp &optional def-form) symbolp]] + &or (cl-macro-arg &optional def-form) arg]] . [&or arg nil]))) ;;;###autoload |