procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'savannah/master' into HEAD

Browse source
This commit is contained in:
Andrea Corallo 2020-04-25 15:13:18 +01:00
commit c984a53b4e
38 changed files with 123 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/emacs-lisp/edebug.el
View file

@ -1833,9 +1833,6 @@ contains a circular object."
;; This means nothing matched, so it is OK.
nil) ;; So, return nothing
(def-edebug-spec &key edebug-match-&key)
(defun edebug-match-&key (cursor specs)
;; Following specs must look like (<name> <spec>) ...
;; where <name> is the name of a keyword, and spec is its spec.
@ -2115,10 +2112,10 @@ into `edebug--cl-macrolet-defs' which is checked in `edebug-list-form-args'."
(def-edebug-spec edebug-spec
(&or
edebug-spec-list
(vector &rest edebug-spec) ; matches a vector
("vector" &rest edebug-spec) ; matches a vector spec
("quote" symbolp)
edebug-spec-list
stringp
[edebug-lambda-list-keywordp &rest edebug-spec]
[keywordp gate edebug-spec]