[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/cl-macs.el

[Stefan Monnier]

Index: emacs/lisp/emacs-lisp/cl-macs.el
diff -c emacs/lisp/emacs-lisp/cl-macs.el:1.55 
emacs/lisp/emacs-lisp/cl-macs.el:1.56
*** emacs/lisp/emacs-lisp/cl-macs.el:1.55       Sat Jul 16 11:53:25 2005
--- emacs/lisp/emacs-lisp/cl-macs.el    Sun Nov 27 20:59:10 2005
***************
*** 2175,2181 ****
                                       (symbol-name (car args)) ""))))
              ((eq opt :constructor)
               (if (cdr args)
!                  (push args constrs)
                 (if args (setq constructor (car args)))))
              ((eq opt :copier)
               (if args (setq copier (car args))))
--- 2175,2186 ----
                                       (symbol-name (car args)) ""))))
              ((eq opt :constructor)
               (if (cdr args)
!                    (progn
!                      ;; If this defines a constructor of the same name as
!                      ;; the default one, don't define the default.
!                      (if (eq (car args) constructor)
!                          (setq constructor nil))
!                      (push args constrs))
                 (if args (setq constructor (car args)))))
              ((eq opt :copier)
               (if args (setq copier (car args))))