summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-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]