# HG changeset patch # User Richard M. Stallman # Date 1005868663 0 # Node ID 0bcf2d7f0112fbfbde4a55e79a1812cb9745e71b # Parent ef7a153a2c6808c7573c29c8b06c77925eecb3fb (values, values-list, multiple-value-list, multiple-value-apply, nth-value): Use defsubst rather than defalias, to get better doc strings. diff -r ef7a153a2c68 -r 0bcf2d7f0112 lisp/emacs-lisp/cl.el --- a/lisp/emacs-lisp/cl.el Thu Nov 15 22:53:54 2001 +0000 +++ b/lisp/emacs-lisp/cl.el Thu Nov 15 23:57:43 2001 +0000 @@ -203,12 +203,38 @@ ;;; simulated. Instead, multiple-value-bind and friends simply expect ;;; the target form to return the values as a list. -(defalias 'values 'list) -(defalias 'values-list 'identity) -(defalias 'multiple-value-list 'identity) -(defalias 'multiple-value-call 'apply) ; only works for one arg -(defalias 'nth-value 'nth) +(defsubst values (&rest values) + "Return multiple values, Common Lisp style. +The arguments of `values' are the values +that the containing function should return." + (apply 'list values)) + +(defsubst values-list (list) + "Return multiple values, Common Lisp style, taken from a list. +LIST specifies the list of values +that the containing function should return." + list) +(defsubst multiple-value-list (expression) + "Return a list of the multiple values produced by EXPRESSION. +This handles multiple values in Common Lisp style, but it does not +work right when EXPRESSION calls an ordinary Emacs Lisp function +that returns just one value." + expression) + +(defsubst multiple-value-apply (function expression) + "Evaluate EXPRESSION to get multiple values and apply FUNCTION to them. +This handles multiple values in Common Lisp style, but it does not work +right when EXPRESSION calls an ordinary Emacs Lisp function that returns just +one value." + (apply function expression)) + +(defsubst nth-value (n expression) + "Evaluate EXPRESSION to get multiple values and return the Nth one. +This handles multiple values in Common Lisp style, but it does not work +right when EXPRESSION calls an ordinary Emacs Lisp function that returns just +one value." + (nth n expression)) ;;; Macros.