diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-06-13 16:52:25 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-06-13 16:52:25 -0400 |
| commit | 5a315f9ce965e29d4e8c034c453030d20307be20 (patch) | |
| tree | 680d23977968c6b35bd5917eaf63979c64ef3aa8 /lisp/emacs-lisp | |
| parent | 16192a571104a951f1d3fee722addd5a32a27ce3 (diff) | |
| download | emacs-5a315f9ce965e29d4e8c034c453030d20307be20.tar.gz emacs-5a315f9ce965e29d4e8c034c453030d20307be20.tar.bz2 emacs-5a315f9ce965e29d4e8c034c453030d20307be20.zip | |
* 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.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index bc90898ad00..b3236e84b70 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -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) |