Add new function dom-remove-node

[gnu-emacs] / lisp / cus-start.el

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 2b9cc094f9582325afcfaa3bbea0ee6f41784301..2b79bbbfda1e8ffd66b9b12acbd45211d83a9264 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -1,6 +1,6 @@
 ;;; cus-start.el --- define customization properties of builtins  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1997, 1999-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999-2016 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
@@ -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)
@@ -220,15 +221,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (visible-bell display boolean)
             (no-redraw-on-reenter display boolean)
 
-            ;; doc.c
-            (text-quoting-style
-              help
-              (choice
-               (const :tag "Quote with curved single quotes \\=‘like this\\=’" curve)
-               (const :tag "Quote with straight apostrophes \\='like this\\='" straight)
-               (const :tag "Quote with grave accent and apostrophe \\=`like this\\='" grave)
-               (const :tag "Use curved quotes if displayable, grave accent and apostrophe otherwise" nil))
-              "25.1")
              ;; dosfns.c
             (dos-display-scancodes display boolean)
             (dos-hyper-key keyboard integer)
@@ -320,6 +312,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                            (const :tag "Always" t)
                                            (repeat (symbol :tag "Parameter")))
                                           "25.1")
+            (tooltip-reuse-hidden-frame tooltip boolean "25.2")
             ;; fringe.c
             (overflow-newline-into-fringe fringe boolean)
             ;; image.c
@@ -635,7 +628,7 @@ since it could result in memory overflow and make Emacs crash."
     (if (not (boundp symbol))
        ;; If variables are removed from C code, give an error here!
        (and native-p
-            (message "Note, built-in variable ‘%S’ not bound" symbol))
+            (message "Note, built-in variable `%S' not bound" symbol))
       ;; Save the standard value, unless we already did.
       (or (get symbol 'standard-value)
          (put symbol 'standard-value (list standard)))