mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-07 15:00:34 -08:00
* lisp/emacs-lisp/cl-macs.el (cl-defstruct): Don't add print-func.
* lisp/files.el: Require cl-lib. (file-name-non-special): Replace case -> cl-case.
This commit is contained in:
parent
16192a5711
commit
5a315f9ce9
3 changed files with 22 additions and 12 deletions
|
|
@ -2731,14 +2731,17 @@ value, that slot cannot be set via `cl-setf'.
|
|||
(if (cl--safe-expr-p `(progn ,@(mapcar #'cl-second descs)))
|
||||
(push (cons name t) side-eff))))
|
||||
(if print-auto (nconc print-func (list '(princ ")" cl-s) t)))
|
||||
(if print-func
|
||||
(push `(push
|
||||
;; The auto-generated function does not pay attention to
|
||||
;; the depth argument cl-n.
|
||||
(lambda (cl-x cl-s ,(if print-auto '_cl-n 'cl-n))
|
||||
(and ,pred-form ,print-func))
|
||||
cl-custom-print-functions)
|
||||
forms))
|
||||
;; Don't bother adding to cl-custom-print-functions since it's not used
|
||||
;; by anything anyway!
|
||||
;;(if print-func
|
||||
;; (push `(if (boundp 'cl-custom-print-functions)
|
||||
;; (push
|
||||
;; ;; The auto-generated function does not pay attention to
|
||||
;; ;; the depth argument cl-n.
|
||||
;; (lambda (cl-x cl-s ,(if print-auto '_cl-n 'cl-n))
|
||||
;; (and ,pred-form ,print-func))
|
||||
;; cl-custom-print-functions))
|
||||
;; forms))
|
||||
(push `(setq ,tag-symbol (list ',tag)) forms)
|
||||
(push `(cl-eval-when (compile load eval)
|
||||
(put ',name 'cl-struct-slots ',descs)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue