lisp/frameset.el (frameset-prop): New function and setter.

(frameset-save): Do not modify frame list passed by the caller.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c91cb5564abe58a6385c06bdd1693b1f2674b4d0..f971cb202f4491e6b6dfd569a538067cc10d2fa5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-03  Juanma Barranquero  <lekktu@gmail.com>
+
+       * frameset.el (frameset-prop): New function and setter.
+       (frameset-save): Do not modify frame list passed by the caller.
+
 2013-08-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/package.el (package-desc-from-define): Ignore unknown keys.

diff --git a/lisp/frameset.el b/lisp/frameset.el
index 9610d4570082e8a59f52133d651b259502a444af..8bb734b96fee42a14e92a3dce698d954f2d42c64 100644 (file)
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -78,6 +78,21 @@ Else return nil."
   (and (eq (car-safe frameset) 'frameset)
        (plist-get (cl-second frameset) :version)))
 
+;; A setf'able accessor to the frameset's properties
+(defun frameset-prop (frameset prop)
+  "Return the value of the PROP property of FRAMESET.
+
+Properties other than :version can be set with
+
+  (setf (frameset-prop FRAMESET PROP) NEW-VALUE)"
+  (plist-get (frameset-properties frameset) prop))
+
+(gv-define-setter frameset-prop (v fs prop)
+  `(progn
+     (cl-assert (not (eq ,prop :version)) t ":version can not be set")
+     (setf (frameset-properties ,fs)
+        (plist-put (frameset-properties ,fs) ,prop ,v))))
+
 \f
 ;; Filtering
 
@@ -294,8 +309,9 @@ PREDICATE is a predicate function, which must return non-nil for frames that
 should be saved; it defaults to saving all frames from FRAME-LIST.
 PROPERTIES is a user-defined property list to add to the frameset."
   (let ((frames (cl-delete-if-not #'frame-live-p
-                                 (cl-remove-if-not (or predicate #'framep)
-                                                   (or frame-list (frame-list))))))
+                                 (cl-delete-if-not (or predicate #'framep)
+                                                   (or (copy-sequence frame-list)
+                                                       (frame-list))))))
     (frameset--process-minibuffer-frames frames)
     (make-frameset :properties (append '(:version 1) properties)
                   :states (mapcar