diff options
| author | Stefan Monnier | 2007-08-23 18:38:33 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-08-23 18:38:33 +0000 |
| commit | 2fa9dc2f3a2ac7a023d570f7756cf05a22f80b62 (patch) | |
| tree | 03564968d24fbedeae1649be090a7b424a8dbc7c | |
| parent | 1c232e1069a994efecd304789d823fd30686d700 (diff) | |
| download | emacs-2fa9dc2f3a2ac7a023d570f7756cf05a22f80b62.tar.gz emacs-2fa9dc2f3a2ac7a023d570f7756cf05a22f80b62.zip | |
(edebug-list-form, edebug-match-symbol, \,)
(\,@): Backslash the , and ,@ which are not new-style unquotes.
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index a39975c993e..e975a0f0bea 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el | |||
| @@ -1507,7 +1507,7 @@ expressions; a `progn' form will be returned enclosing these forms." | |||
| 1507 | head (edebug-move-cursor cursor)))))) | 1507 | head (edebug-move-cursor cursor)))))) |
| 1508 | 1508 | ||
| 1509 | ((consp head) | 1509 | ((consp head) |
| 1510 | (if (eq (car head) ',) | 1510 | (if (eq (car head) '\,) |
| 1511 | ;; The head of a form should normally be a symbol or a lambda | 1511 | ;; The head of a form should normally be a symbol or a lambda |
| 1512 | ;; expression but it can also be an unquote form to be filled | 1512 | ;; expression but it can also be an unquote form to be filled |
| 1513 | ;; before evaluation. We evaluate the arguments anyway, on the | 1513 | ;; before evaluation. We evaluate the arguments anyway, on the |
| @@ -1664,7 +1664,7 @@ expressions; a `progn' form will be returned enclosing these forms." | |||
| 1664 | ((fboundp symbol) ; is it a predicate? | 1664 | ((fboundp symbol) ; is it a predicate? |
| 1665 | (let ((sexp (edebug-top-element-required cursor "Expected" symbol))) | 1665 | (let ((sexp (edebug-top-element-required cursor "Expected" symbol))) |
| 1666 | ;; Special case for edebug-`. | 1666 | ;; Special case for edebug-`. |
| 1667 | (if (and (listp sexp) (eq (car sexp) ',)) | 1667 | (if (and (listp sexp) (eq (car sexp) '\,)) |
| 1668 | (edebug-match cursor '(("," def-form))) | 1668 | (edebug-match cursor '(("," def-form))) |
| 1669 | (if (not (funcall symbol sexp)) | 1669 | (if (not (funcall symbol sexp)) |
| 1670 | (edebug-no-match cursor symbol "failed")) | 1670 | (edebug-no-match cursor symbol "failed")) |
| @@ -2102,8 +2102,8 @@ expressions; a `progn' form will be returned enclosing these forms." | |||
| 2102 | (def-edebug-spec edebug-\` (def-form)) | 2102 | (def-edebug-spec edebug-\` (def-form)) |
| 2103 | 2103 | ||
| 2104 | ;; Assume immediate quote in unquotes mean backquote at next higher level. | 2104 | ;; Assume immediate quote in unquotes mean backquote at next higher level. |
| 2105 | (def-edebug-spec , (&or ("quote" edebug-\`) def-form)) | 2105 | (def-edebug-spec \, (&or ("quote" edebug-\`) def-form)) |
| 2106 | (def-edebug-spec ,@ (&define ;; so (,@ form) is never wrapped. | 2106 | (def-edebug-spec \,@ (&define ;; so (,@ form) is never wrapped. |
| 2107 | &or ("quote" edebug-\`) def-form)) | 2107 | &or ("quote" edebug-\`) def-form)) |
| 2108 | 2108 | ||
| 2109 | ;; New byte compiler. | 2109 | ;; New byte compiler. |