bug#8690: 24.0.50; `declare' doc; conflict with cl-macs.el

[Lars Magne Ingebrigtsen <larsi@gnus.org>]

"Drew Adams" <drew.adams@oracle.com> writes:

> Something should be done about this.  Perhaps rename the cl form to
> avoid the conflict?  Dunno.  But we shouldn't be getting into this kind
> of conflict/confusion.  Unless the two are truly compatible, in which
> case we should add the same doc string to the macro in cl-macs.el.

The subr.el definition of `declare' is:

(defmacro declare (&rest _specs)
  "Do not evaluate any arguments and return nil.
Treated as a declaration when used at the right place in a
`defmacro' form.  \(See Info anchor `(elisp)Definition of declare'.)"
  nil)

The cl-macs.el definition is:
  
(defmacro declare (&rest specs)
  (if (cl-compiling-file)
      (while specs
	(if (listp cl-declare-stack) (push (car specs) cl-declare-stack))
	(cl-do-proclaim (pop specs) nil)))
  nil)

So the cl-macs.el version extends the macro, but it's just nil, anyway.

So perhaps the fix here is just to copy over the doc string from the
subr.el version to the cl-macs.el version?
  
-- 
(domestic pets only, the antidote for overdose, milk.)
  bloggy blog http://lars.ingebrigtsen.no/