From: Stefan Monnier Date: Sat, 5 Jul 2003 00:23:04 +0000 (+0000) Subject: (cl-transform-lambda): Strip &cl-defs X-Git-Tag: ttn-vms-21-2-B4~9498 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1360464e6200d301ffb3d6c5b76735748f6c8f06;p=emacs.git (cl-transform-lambda): Strip &cl-defs thingies from constructors created by defstruct. --- diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index a6e081fd0d1..ad757149509 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -1,6 +1,6 @@ ;;; cl-macs.el --- Common Lisp macros -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2003 Free Software Foundation, Inc. ;; Author: Dave Gillespie ;; Version: 2.02 @@ -266,7 +266,12 @@ ARGLIST allows full Common Lisp conventions." (nconc (let ((hdr (nreverse header))) (require 'help-fns) (cons (help-add-fundoc-usage - (if (stringp (car hdr)) (pop hdr)) orig-args) + (if (stringp (car hdr)) (pop hdr)) + ;; orig-args can contain &cl-defs (an internal CL + ;; thingy that I do not understand), so remove it. + (let ((x (memq '&cl-defs orig-args))) + (if (null x) orig-args + (delq (car x) (remq (cadr x) orig-args))))) hdr)) (list (nconc (list 'let* bind-lets) (nreverse bind-forms) body)))))))