Fix custom types for cursor-in-non-selected-windows

* lisp/cus-start.el (standard): Use the same custom types for
cursor-in-non-selected-windows as for cursor-type (bug#19214).

(cherry picked from commit b66bc0cced786e0320e1c3b0758bd3c434d4e8b5)

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 5be61ce537c697d76e5b1f8a287a0f74e5c9feb1..001d638ca1461a5b2e160ec891db86d440fd6cd4 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -54,7 +54,8 @@
 ;; :risky - risky-local-variable property
 ;; :safe - safe-local-variable property
 ;; :tag - custom-tag property
-(let (standard native-p prop propval
+(let (standard
+      native-p prop propval
       ;; This function turns a value
       ;; into an expression which produces that value.
       (quoter (lambda (sexp)
@@ -67,27 +68,27 @@
                        (stringp sexp)
                        (numberp sexp))
                    sexp
-                 (list 'quote sexp)))))
+                 (list 'quote sexp))))
+      (cursor-type-types
+       '(choice
+         (const :tag "Frame default" t)
+         (const :tag "Filled box" box)
+         (const :tag "Hollow cursor" hollow)
+         (const :tag "Vertical bar" bar)
+         (cons  :tag "Vertical bar with specified width"
+                (const bar) integer)
+         (const :tag "Horizontal bar" hbar)
+         (cons  :tag "Horizontal bar with specified width"
+                (const hbar) integer)
+         (const :tag "None "nil))))
   (pcase-dolist
       (`(,symbol ,group ,type ,version . ,rest)
-           '(;; alloc.c
+           `(;; alloc.c
             (gc-cons-threshold alloc integer)
             (gc-cons-percentage alloc float)
             (garbage-collection-messages alloc boolean)
             ;; buffer.c
-            (cursor-type
-             display
-             (choice
-              (const :tag "Frame default" t)
-              (const :tag "Filled box" box)
-              (const :tag "Hollow cursor" hollow)
-              (const :tag "Vertical bar" bar)
-              (cons  :tag "Vertical bar with specified width"
-                     (const bar) integer)
-              (const :tag "Horizontal bar" hbar)
-              (cons  :tag "Horizontal bar with specified width"
-                     (const hbar) integer)
-              (const :tag "None "nil)))
+            (cursor-type display ,cursor-type-types)
             (mode-line-format mode-line sexp) ;Hard to do right.
             (major-mode internal function)
             (case-fold-search matching boolean)
@@ -147,7 +148,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (line-spacing display (choice (const :tag "none" nil) number)
                           "22.1")
             (cursor-in-non-selected-windows
-             cursor boolean nil
+             cursor ,cursor-type-types nil
              :tag "Cursor In Non-selected Windows"
              :set (lambda (symbol value)
                     (set-default symbol value)