diff options
| author | Miles Bader <miles@gnu.org> | 2007-08-29 05:03:40 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-08-29 05:03:40 +0000 |
| commit | 1bb9a689acfe821e0aa777ddf4e074556c7817a1 (patch) | |
| tree | f5478f932f35dc848934f28d5489204ff55e7e89 /lisp/emacs-lisp/backquote.el | |
| parent | 45f1ce5dc2e5e7830727b22925ad0ebc834726bd (diff) | |
| parent | cb5b9015b372175f1fc90cb7ba3f43298c621509 (diff) | |
| download | emacs-1bb9a689acfe821e0aa777ddf4e074556c7817a1.tar.gz emacs-1bb9a689acfe821e0aa777ddf4e074556c7817a1.tar.bz2 emacs-1bb9a689acfe821e0aa777ddf4e074556c7817a1.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 857-865)
- Update from CVS
- Merge from emacs--rel--22
- Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.
- Remove RCS keywords
* emacs--rel--22 (patch 97-100)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 246-247)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-252
Diffstat (limited to 'lisp/emacs-lisp/backquote.el')
| -rw-r--r-- | lisp/emacs-lisp/backquote.el | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el index 6daaf001433..a2a929d9601 100644 --- a/lisp/emacs-lisp/backquote.el +++ b/lisp/emacs-lisp/backquote.el @@ -85,10 +85,10 @@ For example (backquote-list* 'a 'b 'c) => (a b . c)" (defconst backquote-backquote-symbol '\` "Symbol used to represent a backquote or nested backquote.") -(defconst backquote-unquote-symbol ', +(defconst backquote-unquote-symbol '\, "Symbol used to represent an unquote inside a backquote.") -(defconst backquote-splice-symbol ',@ +(defconst backquote-splice-symbol '\,@ "Symbol used to represent a splice inside a backquote.") ;;;###autoload @@ -121,9 +121,8 @@ Vectors work just like lists. Nested backquotes are permitted." (defun backquote-delay-process (s level) "Process a (un|back|splice)quote inside a backquote. This simply recurses through the body." - (let ((exp (backquote-listify (list (backquote-process (nth 1 s) level) - (cons 0 (list 'quote (car s)))) - '(0)))) + (let ((exp (backquote-listify (list (cons 0 (list 'quote (car s)))) + (backquote-process (cdr s) level)))) (if (eq (car-safe exp) 'quote) (cons 0 (list 'quote s)) (cons 1 exp)))) |