Merge from origin/emacs-25

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 7a37198fb2c338193446d37557c6377488cb4e3b..1c10bf76320e78b08250edadc65fc44f7445031a 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
@@ -220,17 +220,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" 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)
@@ -322,6 +311,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 "26.1")
             ;; fringe.c
             (overflow-newline-into-fringe fringe boolean)
             ;; image.c