diff options
Diffstat (limited to 'lisp/emacs-lisp/cl-macs.el')
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index f5e1ffb0008..80f0cd73cee 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -1,4 +1,4 @@ -;;; cl-macs.el --- Common Lisp macros -*- lexical-binding: t; coding: utf-8 -*- +;;; cl-macs.el --- Common Lisp macros -*- lexical-binding: t -*- ;; Copyright (C) 1993, 2001-2015 Free Software Foundation, Inc. @@ -2101,8 +2101,8 @@ by EXPANSION, and (setq NAME ...) will act like (setf EXPANSION ...). macroexpand-all-environment)))) (if (or (null (cdar bindings)) (cl-cddar bindings)) (macroexp--warn-and-return - (format "Malformed `cl-symbol-macrolet' binding: %S" - (car bindings)) + (format-message "Malformed `cl-symbol-macrolet' binding: %S" + (car bindings)) expansion) expansion))) (fset 'macroexpand previous-macroexpand)))))) @@ -2730,7 +2730,7 @@ non-nil value, that slot cannot be set via `setf'. slots defaults))) (push `(cl-defsubst ,cname (&cl-defs (nil ,@descs) ,@args) - ,(if (stringp doc) (list doc) + ,(if (stringp doc) doc (format "Constructor for objects of type `%s'." name)) ,@(if (cl--safe-expr-p `(progn ,@(mapcar #'cl-second descs))) '((declare (side-effect-free t)))) @@ -2777,10 +2777,10 @@ non-nil value, that slot cannot be set via `setf'. ;;;###autoload (pcase-defmacro cl-struct (type &rest fields) "Pcase patterns to match cl-structs. -Elements of FIELDS can be of the form (NAME UPAT) in which case the contents of -field NAME is matched against UPAT, or they can be of the form NAME which +Elements of FIELDS can be of the form (NAME PAT) in which case the contents of +field NAME is matched against PAT, or they can be of the form NAME which is a shorthand for (NAME NAME)." - (declare (debug (sexp &rest [&or (sexp pcase-UPAT) sexp]))) + (declare (debug (sexp &rest [&or (sexp pcase-PAT) sexp]))) `(and (pred (pcase--flip cl-typep ',type)) ,@(mapcar (lambda (field) |