aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2013-08-11 05:09:21 +0200
committerJuanma Barranquero2013-08-11 05:09:21 +0200
commit7ec326db1dfe07523c8e22fb98f8aed6c8f2ae7e (patch)
tree03483f6fad3f6a6b374004c93e04d8a1affe5989
parent7d652d97681c4f1b67018f44f64c619ef5edd990 (diff)
downloademacs-7ec326db1dfe07523c8e22fb98f8aed6c8f2ae7e.tar.gz
emacs-7ec326db1dfe07523c8e22fb98f8aed6c8f2ae7e.zip
lisp/frameset.el (frameset-valid-p): Fix check; STATES can indeed be nil.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/frameset.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed1aa7c18f0..ac360a3e422 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-08-11 Juanma Barranquero <lekktu@gmail.com>
2
3 * frameset.el (frameset-valid-p): Fix check; STATES can indeed be nil.
4
12013-08-10 Juanma Barranquero <lekktu@gmail.com> 52013-08-10 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * tutorial.el (tutorial--describe-nonstandard-key): Use string-match-p. 7 * tutorial.el (tutorial--describe-nonstandard-key): Use string-match-p.
diff --git a/lisp/frameset.el b/lisp/frameset.el
index 132cbcd4856..a347599bb51 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -156,7 +156,7 @@ a valid one, and the frameset version if it is valid."
156 (stringp (or (aref object 4) "")) ; NAME is a string or nil 156 (stringp (or (aref object 4) "")) ; NAME is a string or nil
157 (stringp (or (aref object 5) "")) ; DESCRIPTION is a string or nil 157 (stringp (or (aref object 5) "")) ; DESCRIPTION is a string or nil
158 (listp (aref object 6)) ; PROPERTIES is a list 158 (listp (aref object 6)) ; PROPERTIES is a list
159 (consp (aref object 7)) ; and STATES is non-nil 159 (listp (aref object 7)) ; and STATES is, too
160 (cl-every #'consp (aref object 7)) ; and an alist 160 (cl-every #'consp (aref object 7)) ; and an alist
161 (aref object 1))) ; return VERSION 161 (aref object 1))) ; return VERSION
162 162