comparison lisp/cl.el @ 5470:0af042a0c116

Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Mon, 07 Feb 2011 21:22:17 +0100
parents 89331fa1c819 38e24b8be4ea
children 00e79bbbe48f
comparison
equal deleted inserted replaced
5469:2a8a04f73c15 5470:0af042a0c116
200 ;; The macros `when' and `unless' are so useful that we want them to 200 ;; The macros `when' and `unless' are so useful that we want them to
201 ;; ALWAYS be available. So they've been moved from cl.el to eval.c. 201 ;; ALWAYS be available. So they've been moved from cl.el to eval.c.
202 ;; Note: FSF Emacs moved them to subr.el in FSF 20. 202 ;; Note: FSF Emacs moved them to subr.el in FSF 20.
203 203
204 (defalias 'cl-map-extents 'map-extents) 204 (defalias 'cl-map-extents 'map-extents)
205
206 ;;; Blocks and exits.
207
208 ;; This used to be #'identity, but that didn't preserve multiple values in
209 ;; interpreted code. #'and isn't great either, there's no error on too many
210 ;; arguments passed to it when interpreted. Fortunately most of the places
211 ;; where cl-block-wrapper is called are generated from old, established
212 ;; macros, so too many arguments resulting from human error is unlikely; and
213 ;; the byte compile handler in cl-macs.el warns if more than one arg is
214 ;; passed to it.
215 (defalias 'cl-block-wrapper 'and)
216
217 (defalias 'cl-block-throw 'throw)
218 205
219 ;;; XEmacs; multiple values are in eval.c and cl-macs.el. 206 ;;; XEmacs; multiple values are in eval.c and cl-macs.el.
220 207
221 ;;; We no longer support `multiple-value-apply', which was ill-conceived to 208 ;;; We no longer support `multiple-value-apply', which was ill-conceived to
222 ;;; start with, is not specified by Common Lisp, and which nothing uses, 209 ;;; start with, is not specified by Common Lisp, and which nothing uses,