Merge from origin/emacs-25

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index b96b81763ce1beadb59930f298d4f49720b85dc7..c830ed83d1da4b278c4ba40fba4322730647ad68 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)
@@ -169,13 +170,19 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (shell-file-name execute file)
             (exec-path execute
                        (repeat (choice (const :tag "default directory" nil)
-                                       (directory :format "%v"))))
+                                       (directory :format "%v")))
+                        nil
+                        :standard
+                        (mapcar 'directory-file-name
+                                (append (parse-colon-path (getenv "PATH"))
+                                        (list exec-directory))))
             (exec-suffixes execute (repeat string))
             ;; charset.c
             (charset-map-path installation
                               (repeat (directory :format "%v")))
             ;; coding.c
             (inhibit-eol-conversion mule boolean)
+            (enable-character-translation mule boolean)
             (eol-mnemonic-undecided mule string)
             ;; startup.el fiddles with the values.  IMO, would be
             ;; simpler to just use #ifdefs in coding.c.
@@ -214,7 +221,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (visible-bell display boolean)
             (no-redraw-on-reenter display boolean)
 
-            ;; dosfns.c
+             ;; dosfns.c
             (dos-display-scancodes display boolean)
             (dos-hyper-key keyboard integer)
             (dos-super-key keyboard integer)
@@ -305,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 "26.1")
             ;; fringe.c
             (overflow-newline-into-fringe fringe boolean)
             ;; image.c
@@ -379,7 +387,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             ;; options property set at end
             (read-buffer-function minibuffer
                                   (choice (const nil)
-                                          (function-item iswitchb-read-buffer)
                                           function))
             ;; msdos.c
             (dos-unsupported-char-glyph display integer)
@@ -434,6 +441,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                      (const super)) "23.1")
             (ns-antialias-text ns boolean "23.1")
             (ns-auto-hide-menu-bar ns boolean "24.1")
+             (ns-confirm-quit ns boolean "25.1")
             (ns-use-native-fullscreen ns boolean "24.4")
              (ns-use-fullscreen-animation ns boolean "25.1")
              (ns-use-srgb-colorspace ns boolean "24.4")
@@ -633,7 +641,11 @@ since it could result in memory overflow and make Emacs crash."
          (put symbol 'custom-set (cadr prop)))
       ;; Note this is the _only_ initialize property we handle.
       (if (eq (cadr (memq :initialize rest)) 'custom-initialize-delay)
-         (push symbol custom-delayed-init-variables))
+          ;; These vars are defined early and should hence be initialized
+          ;; early, even if this file happens to be loaded late.  so add them
+          ;; to the end of custom-delayed-init-variables.  Otherwise,
+          ;; auto-save-file-name-transforms will appear in M-x customize-rogue.
+         (add-to-list 'custom-delayed-init-variables symbol 'append))
       ;; If this is NOT while dumping Emacs, set up the rest of the
       ;; customization info.  This is the stuff that is not needed
       ;; until someone does M-x customize etc.
@@ -654,7 +666,6 @@ since it could result in memory overflow and make Emacs crash."
                ((eq prop :tag)
                 (put symbol 'custom-tag propval))))))))
 
-(custom-add-to-group 'iswitchb 'read-buffer-function 'custom-variable)
 (custom-add-to-group 'font-lock 'open-paren-in-column-0-is-defun-start
                     'custom-variable)