diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 19 | ||||
| -rw-r--r-- | lisp/files.el | 10 |
3 files changed, 22 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3669101d3ae..5d08e2e7a81 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2012-06-13 Stefan Monnier <monnier@iro.umontreal.ca> + * 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*. 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) diff --git a/lisp/files.el b/lisp/files.el index 619e64ddb04..a934eca4527 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -28,6 +28,8 @@ ;;; Code: +(eval-when-compile (require 'cl-lib)) + (defvar font-lock-keywords) (defgroup backup nil @@ -6459,20 +6461,20 @@ only these files will be asked to be saved." "/" (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. |