[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108604: * lisp/emacs-lisp/cl-macs.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108604: * lisp/emacs-lisp/cl-macs.el (cl-defstruct): Don't add print-func. |
Date: |
Wed, 13 Jun 2012 16:52:25 -0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108604
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2012-06-13 16:52:25 -0400
message:
* 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.
modified:
lisp/ChangeLog
lisp/emacs-lisp/cl-macs.el
lisp/files.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-06-13 15:46:29 +0000
+++ b/lisp/ChangeLog 2012-06-13 20:52:25 +0000
@@ -1,5 +1,10 @@
2012-06-13 Stefan Monnier <address@hidden>
+ * files.el: Require cl-lib.
+ (file-name-non-special): Replace case -> cl-case.
+
+ * emacs-lisp/cl-macs.el (cl-defstruct): Don't add print-func.
+
* emacs-lisp/edebug.el (edebug-read-function): Remove old incorrect
mapping from #' to function*.
=== modified file 'lisp/emacs-lisp/cl-macs.el'
--- a/lisp/emacs-lisp/cl-macs.el 2012-06-12 18:10:34 +0000
+++ b/lisp/emacs-lisp/cl-macs.el 2012-06-13 20:52:25 +0000
@@ -2731,14 +2731,17 @@
(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)
=== modified file 'lisp/files.el'
--- a/lisp/files.el 2012-06-08 13:18:26 +0000
+++ b/lisp/files.el 2012-06-13 20:52:25 +0000
@@ -28,6 +28,8 @@
;;; Code:
+(eval-when-compile (require 'cl-lib))
+
(defvar font-lock-keywords)
(defgroup backup nil
@@ -6459,20 +6461,20 @@
"/"
(substring (car pair) 2)))))
(setq file-arg-indices (cdr file-arg-indices))))
- (case method
+ (cl-case method
(identity (car arguments))
(add (concat "/:" (apply operation arguments)))
(insert-file-contents
(let ((visit (nth 1 arguments)))
(prog1
- (apply operation arguments)
+ (apply operation arguments)
(when (and visit buffer-file-name)
(setq buffer-file-name (concat "/:" buffer-file-name))))))
(unquote-then-quote
(let ((buffer-file-name (substring buffer-file-name 2)))
(apply operation arguments)))
- (t
- (apply operation arguments)))))
+ (t
+ (apply operation arguments)))))
;; Symbolic modes and read-file-modes.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108604: * lisp/emacs-lisp/cl-macs.el (cl-defstruct): Don't add print-func.,
Stefan Monnier <=