diff options
author | Andrea Corallo <akrl@sdf.org> | 2020-04-25 15:13:18 +0100 |
---|---|---|
committer | Andrea Corallo <akrl@sdf.org> | 2020-04-25 15:13:18 +0100 |
commit | c984a53b4e198e31d11d7bc493dc9a686c77edae (patch) | |
tree | 5c1241a0a3b5e7fc80a1ef7cb3dd922b5451d57f /lisp/emacs-lisp | |
parent | bab36619fb26059e3ac7c794738be4314c681e08 (diff) | |
parent | f7748ad682abca5968ce24ed488ba56d2e48ef8a (diff) | |
download | emacs-c984a53b4e198e31d11d7bc493dc9a686c77edae.tar.gz emacs-c984a53b4e198e31d11d7bc493dc9a686c77edae.tar.bz2 emacs-c984a53b4e198e31d11d7bc493dc9a686c77edae.zip |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r-- | lisp/emacs-lisp/edebug.el | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index bb7817f242c..a376067443a 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -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] |