[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113750: lisp/frameset.el (frameset-restore): Doc fi
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] trunk r113750: lisp/frameset.el (frameset-restore): Doc fix. |
Date: |
Thu, 08 Aug 2013 01:19:22 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113750
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2013-08-08 03:19:11 +0200
message:
lisp/frameset.el (frameset-restore): Doc fix.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/frameset.el frameset.el-20130802043218-tfwraxv1c2zlibpw-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-08-08 00:44:22 +0000
+++ b/lisp/ChangeLog 2013-08-08 01:19:11 +0000
@@ -1,5 +1,7 @@
2013-08-08 Juanma Barranquero <address@hidden>
+ * frameset.el (frameset-restore): Doc fix.
+
* register.el (frameset-frame-id, frameset-frame-with-id)
(frameset-p, frameset-restore, frameset-save): Declare.
(register-alist): Document framesets.
=== modified file 'lisp/frameset.el'
--- a/lisp/frameset.el 2013-08-07 22:54:08 +0000
+++ b/lisp/frameset.el 2013-08-08 01:19:11 +0000
@@ -55,21 +55,21 @@
of the frameset struct. Currently its value is 1.
timestamp A read-only timestamp, the output of `current-time'.
app A symbol, or a list whose first element is a symbol, which
- identifies the creator of the frameset and related info;
- for example, desktop.el sets this slot to a list
- `(desktop . ,desktop-file-version).
+ identifies the creator of the frameset and related info;
+ for example, desktop.el sets this slot to a list
+ `(desktop . ,desktop-file-version).
name A string, the name of the frameset instance.
description A string, a description for user consumption (to show in
- menus, messages, etc).
+ menus, messages, etc).
properties A property list, to store both frameset-specific and
user-defined serializable data.
states A list of items (FRAME-PARAMETERS . WINDOW-STATE), in no
particular order. Each item represents a frame to be
restored. FRAME-PARAMETERS is a frame's parameter alist,
extracted with (frame-parameters FRAME) and filtered
- through `frameset-filter-params'.
+ through `frameset-filter-params'.
WINDOW-STATE is the output of `window-state-get' applied
- to the root window of the frame.
+ to the root window of the frame.
To avoid collisions, it is recommended that applications wanting to add
private serializable data to `properties' either store all info under a
@@ -969,7 +969,7 @@
;;;###autoload
(cl-defun frameset-restore (frameset
&key predicate filters reuse-frames
- force-display force-onscreen)
+ force-display force-onscreen)
"Restore a FRAMESET into the current display(s).
PREDICATE is a function called with two arguments, the parameter alist
@@ -1009,8 +1009,8 @@
It must return non-nil to force the frame onscreen, nil otherwise.
Note the timing and scope of the operations described above: REUSE-FRAMES
-affects existing frames, FILTERS and FORCE-DISPLAY affect the frame being
-restored before that happens, and FORCE-ONSCREEN affects the frame once
+affects existing frames; PREDICATE, FILTERS and FORCE-DISPLAY affect the frame
+being restored before that happens; and FORCE-ONSCREEN affects the frame once
it has been restored.
All keyword parameters default to nil."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113750: lisp/frameset.el (frameset-restore): Doc fix.,
Juanma Barranquero <=