[nongnu] elpa/helm 3ccc1eebd3 4/4: Fix predicates and descriptions for window and frame registers

[ELPA Syncer]

branch: elpa/helm
commit 3ccc1eebd3136f8d7c79b894a4aa5899d911e354
Author: Thierry Volpiatto <thievol@posteo.net>
Commit: Thierry Volpiatto <thievol@posteo.net>

    Fix predicates and descriptions for window and frame registers
---
 helm-ring.el | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/helm-ring.el b/helm-ring.el
index e1161bdc85..1e8f0a2eb7 100644
--- a/helm-ring.el
+++ b/helm-ring.el
@@ -25,7 +25,7 @@
 
 (declare-function undo-tree-restore-state-from-register "ext:undo-tree.el" 
(register))
 (declare-function kmacro--keys "kmacro.el")
-
+(declare-function frameset-register-p "frameset")
 
 (defgroup helm-ring nil
   "Ring related Applications and libraries for Helm."
@@ -387,7 +387,8 @@ yanked string."
                      'jump-to-register
                      'insert-register))))
           ((and (consp val) (window-configuration-p (car val)))
-           (list "window configuration."
+           (list (if (fboundp 'describe-register-1)
+                     (describe-register-1 char) "window configuration.")
                  'jump-to-register))
           ((and (vectorp val)
                 (fboundp 'undo-tree-register-data-p)
@@ -396,8 +397,11 @@ yanked string."
             "Undo-tree entry."
             'undo-tree-restore-state-from-register))
           ((or (and (vectorp val) (eq 'registerv (aref val 0)))
-               (and (consp val) (frame-configuration-p (car val))))
-           (list "frame configuration."
+               (and (consp val) (frame-configuration-p (car val)))
+               (or (frame-configuration-p val)
+                   (frameset-register-p val)))
+           (list (if (fboundp 'describe-register-1)
+                     (describe-register-1 char) "Frame configuration")
                  'jump-to-register))
           ((and (consp val) (eq (car val) 'file))
            (list (concat "file:"