Move frameset-to-register stuff from register.el to frameset.el.

lisp/register.el (frameset-frame-id, frameset-frame-with-id, frameset-p)
(frameset-restore, frameset-save, frameset-session-filter-alist):
Remove declarations.
(register-alist): Doc fix.
(frameset-to-register): Move to frameset.el.
(jump-to-register, describe-register-1): Remove frameset-specific code.

lisp/frameset.el (frameset-p): Add autoload cookie.
(frameset--jump-to-register): New function, based on code moved from
register.el.
(frameset-to-register): Move from register.el.  Adapt to `registerv'.

1 files changed, 38 insertions, 0 deletions

diff --git a/lisp/frameset.el b/lisp/frameset.el
index b1ad9f7702a..132cbcd4856 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -129,6 +129,9 @@ root window of the frame.\n
 IMPORTANT: Modifying this slot may cause frameset functions to fail,
 unless the type constraints defined above are respected.\n\n(fn FRAMESET)")
 
+;;;###autoload (autoload 'frameset-p "frameset"
+;;;###autoload   "Return non-nil if OBJECT is a frameset, nil otherwise." nil)
+
 (defun frameset-copy (frameset)
   "Return a deep copy of FRAMESET.
 FRAMESET is copied with `copy-tree'."
@@ -1184,6 +1187,41 @@ All keyword parameters default to nil."
     (unless (or (daemonp) (visible-frame-list))
       (make-frame-visible (car (frame-list))))))
 
+
+;; Register support
+
+(defun frameset--jump-to-register (data)
+  "Restore frameset from DATA stored in register.
+Called from `jump-to-register'.  Internal use only."
+  (let* ((delete (and current-prefix-arg t))
+         (iconify-list (if delete nil (frame-list))))
+    (frameset-restore (aref data 0)
+                      :filters frameset-session-filter-alist
+                      :reuse-frames (if delete t :keep))
+    (mapc #'iconify-frame iconify-list)
+    (let ((frame (frameset-frame-with-id (aref data 1))))
+      (when frame
+        (select-frame-set-input-focus frame)
+        (goto-char (aref data 2))))))
+
+;;;###autoload
+(defun frameset-to-register (register &optional _arg)
+  "Store the current frameset in register REGISTER.
+Use \\[jump-to-register] to restore the frameset.
+Argument is a character, naming the register."
+  (interactive "cFrameset to register: \nP")
+  (set-register register
+                (registerv-make
+                 (vector (frameset-save nil
+                                        :app 'register
+                                        :filters frameset-session-filter-alist)
+                         ;; frameset-save does not include the value of point
+                         ;; in the current buffer, so record that separately.
+                         (frameset-frame-id nil)
+                         (point-marker))
+                 :print-func (lambda (_data) (princ "a frameset."))
+                 :jump-func #'frameset--jump-to-register)))
+
 (provide 'frameset)
 
 ;;; frameset.el ends here