Make frame configurations start with a distinctive symbol.

	* frame.el (current-frame-configuration): Return a list as before,
	but starting with `frame-configuration'.
	(set-frame-configuration): Check that CONFIGURATION is a list
	starting with `frame-configuration', strip it off, and do as before.
	(frame-configuration-p): New function.
	* register.el (jump-to-register): Use frame-configuration-p,
	instead of catching an error in set-frame-configuration.  Really now.

1 files changed, 10 insertions, 10 deletions

diff --git a/lisp/register.el b/lisp/register.el
index 885e5c5a0a7..25167cf4abd 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -72,16 +72,16 @@ configuration (all frames), restore that frame or all frames accordingly.
 Argument is a character, naming the register."
   (interactive "cJump to register: ")
   (let ((val (get-register char)))
-    (condition-case ()
-	(set-frame-configuration val)
-      (error
-       (if (window-configuration-p val)
-	   (set-window-configuration val)
-	 (if (markerp val)
-	     (progn
-	       (switch-to-buffer (marker-buffer val))
-	       (goto-char val))
-	   (error "Register doesn't contain a buffer position or configuration")))))))
+    (cond
+     ((frame-configuration-p val)
+      (set-frame-configuration val))
+     ((window-configuration-p val)
+      (set-window-configuration val))
+     ((markerp val)
+      (switch-to-buffer (marker-buffer val))
+      (goto-char val))
+     (t
+      (error "Register doesn't contain a buffer position or configuration")))))
 
 ;(defun number-to-register (arg char)
 ;  "Store a number in a register.