lisp/frameset.el: Convert `frameset' to vector and add new slots.

(frameset): Use type vector, not list (incompatible change).
Do not declare a new constructor, use the default one.
Upgrade suggested properties `app', `name' and `desc' to slots `app',
`name' and `description', respectively, and add read-only slot `timestamp'.
Doc fixes.
(frameset-copy, frameset-persistent-filter-alist)
(frameset-filter-alist, frameset-switch-to-gui-p)
(frameset-switch-to-tty-p, frameset-filter-tty-to-GUI)
(frameset-filter-sanitize-color, frameset-filter-minibuffer)
(frameset-filter-iconified, frameset-keep-original-display-p):
Doc fixes.
(frameset-filter-shelve-param, frameset-filter-unshelve-param):
Rename from frameset-filter-(save|restore)-param.  All callers changed.
Doc fix.
(frameset-p): Adapt to change to vector and be more thorough.
Change arg name to OBJECT.  Doc fix.
(frameset-prop): Rename arg PROP to PROPERTY.  Doc fix.
(frameset-session-filter-alist): Rename from frameset-live-filter-alist.
All callers changed.
(frameset-frame-with-id): Rename from frameset-locate-frame-id.
All callers changed.
(frameset--record-minibuffer-relationships): Rename from
frameset--process-minibuffer-frames.  All callers changed.
(frameset-save): Add new keyword arguments APP, NAME and DESCRIPTION.
Use new default constructor (again).  Doc fix.
(frameset--find-frame-if): Rename from `frameset--find-frame.
All callers changed.
(frameset--reuse-frame): Rename arg FRAME-CFG to PARAMETERS.
(frameset--initial-params): Rename arg FRAME-CFG to PARAMETERS.
Doc fix.
(frameset--restore-frame): Rename args FRAME-CFG and WINDOW-CFG to
PARAMETERS and WINDOW-STATE, respectively.
(frameset-restore): Add new keyword argument PREDICATE.
Reset frameset--target-display to nil.  Doc fix.

lisp/desktop.el (desktop-save-frameset): Use new frameset-save args.
Use lexical-binding.

lisp/ChangeLog

+2013-08-07  Juanma Barranquero  <lekktu@gmail.com>
+
+	* desktop.el (desktop-save-frameset): Use new frameset-save args.
+	Use lexical-binding.
+
+	* frameset.el (frameset): Use type vector, not list (incompatible
+	change).  Do not declare a new constructor, use the default one.
+	Upgrade suggested properties `app', `name' and `desc' to slots `app',
+	`name' and `description', respectively, and add read-only slot
+	`timestamp'.  Doc fixes.
+	(frameset-copy, frameset-persistent-filter-alist)
+	(frameset-filter-alist, frameset-switch-to-gui-p)
+	(frameset-switch-to-tty-p, frameset-filter-tty-to-GUI)
+	(frameset-filter-sanitize-color, frameset-filter-minibuffer)
+	(frameset-filter-iconified, frameset-keep-original-display-p):
+	Doc fixes.
+	(frameset-filter-shelve-param, frameset-filter-unshelve-param):
+	Rename from frameset-filter-(save|restore)-param.  All callers changed.
+	Doc fix.
+	(frameset-p): Adapt to change to vector and be more thorough.
+	Change arg name to OBJECT.  Doc fix.
+	(frameset-prop): Rename arg PROP to PROPERTY.  Doc fix.
+	(frameset-session-filter-alist): Rename from frameset-live-filter-alist.
+	All callers changed.
+	(frameset-frame-with-id): Rename from frameset-locate-frame-id.
+	All callers changed.
+	(frameset--record-minibuffer-relationships): Rename from
+	frameset--process-minibuffer-frames.  All callers changed.
+	(frameset-save): Add new keyword arguments APP, NAME and DESCRIPTION.
+	Use new default constructor (again).  Doc fix.
+	(frameset--find-frame-if): Rename from `frameset--find-frame.
+	All callers changed.
+	(frameset--reuse-frame): Rename arg FRAME-CFG to PARAMETERS.
+	(frameset--initial-params): Rename arg FRAME-CFG to PARAMETERS.
+	Doc fix.
+	(frameset--restore-frame): Rename args FRAME-CFG and WINDOW-CFG to
+	PARAMETERS and WINDOW-STATE, respectively.
+	(frameset-restore): Add new keyword argument PREDICATE.
+	Reset frameset--target-display to nil.  Doc fix.
+
 2013-08-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/bat-mode.el (bat--syntax-propertize): New var.

lisp/desktop.el

-;;; desktop.el --- save partial status of Emacs when killed
+;;; desktop.el --- save partial status of Emacs when killed -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1993-1995, 1997, 2000-2013 Free Software Foundation,
 ;; Inc.
@@ -910,12 +910,10 @@ DIRNAME must be the directory in which the desktop file will be saved."
 Frames with a non-nil `desktop-dont-save' parameter are not saved."
   (setq desktop-saved-frameset
 	(and desktop-restore-frames
-	     (let ((name (concat user-login-name "@" system-name
-				 (format-time-string " %Y-%m-%d %T"))))
-	       (frameset-save nil
-			      :predicate #'desktop--check-dont-save
-			      :properties (list :app desktop--app-id
-						:name name))))))
+	     (frameset-save nil
+			    :app desktop--app-id
+			    :name (concat user-login-name "@" system-name)
+			    :predicate #'desktop--check-dont-save))))
 
 ;;;###autoload
 (defun desktop-save (dirname &optional release auto-save)