diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-01-03 16:33:29 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-01-03 16:33:29 +0900 |
| commit | 44f7f57c6833149799539c5e0abcadf4d7d61d43 (patch) | |
| tree | b9bbe6e261c80333dfacb62f7288cc9b37bbf588 /lisp/emacs-lisp/cl-macs.el | |
| parent | 0af4e7587e1b5ac9066e17b875952cb5a16e63c0 (diff) | |
| parent | 825b4ec338e82869dc656c7041ab2483b6c22479 (diff) | |
| download | emacs-44f7f57c6833149799539c5e0abcadf4d7d61d43.tar.gz emacs-44f7f57c6833149799539c5e0abcadf4d7d61d43.tar.bz2 emacs-44f7f57c6833149799539c5e0abcadf4d7d61d43.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/emacs-lisp/cl-macs.el')
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 14b65ef25bf..1cb195d1296 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -1,6 +1,6 @@ ;;; cl-macs.el --- Common Lisp macros -*- lexical-binding: t -*- -;; Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2001-2021 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Old-Version: 2.02 @@ -900,7 +900,8 @@ This is compatible with Common Lisp, but note that `defun' and "The Common Lisp `loop' macro. Valid clauses include: For clauses: - for VAR from/upfrom/downfrom EXPR1 to/upto/downto/above/below EXPR2 [by EXPR3] + for VAR from/upfrom/downfrom EXPR1 to/upto/downto/above/below EXPR2 + [by EXPR3] for VAR = EXPR1 then EXPR2 for VAR in/on/in-ref LIST [by FUNC] for VAR across/across-ref ARRAY @@ -2698,7 +2699,7 @@ Each SLOT may instead take the form (SNAME SDEFAULT SOPTIONS...), where SDEFAULT is the default value of that slot and SOPTIONS are keyword-value pairs for that slot. Supported keywords for slots are: -- `:read-only': If this has a non-nil value, that slot cannot be set via `setf'. +- `:read-only': If this has a non-nil value, that slot cannot be set via `setf'. - `:documentation': this is a docstring describing the slot. - `:type': the type of the field; currently only used for documentation. |