summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Bockgård <bojohan@gnu.org>2009-06-27 22:09:39 +0000
committerJohan Bockgård <bojohan@gnu.org>2009-06-27 22:09:39 +0000
commit00242b07fdc767e6485e8b5bb9aac973e1c5174d (patch)
tree6754e038713907c42ddd3bf01766c7d4c29b0662
parent4189ed40b8f6e0e1c355ca871233d8993c764a07 (diff)
downloademacs-00242b07fdc767e6485e8b5bb9aac973e1c5174d.tar.gz
(defstruct): Fix :conc-name spec.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/cl-specs.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb3c17e7bc5..af4e904f0c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-27 Johan Bockgård <bojohan@gnu.org>
+
+ * emacs-lisp/cl-specs.el (defstruct): Fix :conc-name spec.
+
2009-06-27 Chong Yidong <cyd@stupidchicken.com>
* faces.el (x-handle-named-frame-geometry): Ensure that we have
diff --git a/lisp/emacs-lisp/cl-specs.el b/lisp/emacs-lisp/cl-specs.el
index 4c07bdb7813..31a42b1081c 100644
--- a/lisp/emacs-lisp/cl-specs.el
+++ b/lisp/emacs-lisp/cl-specs.el
@@ -292,7 +292,7 @@
[&or symbolp
(gate
symbolp &rest
- (&or [":conc-name" &or stringp "nil"]
+ (&or [":conc-name" symbolp]
[":constructor" symbolp &optional cl-lambda-list]
[":copier" symbolp]
[":predicate" symbolp]