* admin/grammars/Makefile.in (bootstrap-clean): Don't delete Makefile,

[bpt/emacs.git] / lisp / cus-start.el

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 8e94e85..b446a00 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -1,6 +1,6 @@
 ;;; cus-start.el --- define customization properties of builtins
 
-;; Copyright (C) 1997, 1999-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999-2014 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
@@ -198,6 +198,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
 
             ;; editfns.c
             (user-full-name mail string)
+            ;; emacs.c
+            (report-emacs-bug-address emacsbug string)
             ;; eval.c
             (max-specpdl-size limits integer)
             (max-lisp-eval-depth limits integer)
@@ -312,11 +314,12 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             ;;                         :format "%[Current dir?%] %v"
             ;;                         (const :tag " current dir" nil)
             ;;                         (directory :format "%v"))))
+            (load-prefer-newer lisp boolean "24.4")
             ;; minibuf.c
             (enable-recursive-minibuffers minibuffer boolean)
             (history-length minibuffer
                             (choice (const :tag "Infinite" t) integer)
-                            "22.1")
+                            "24.5")    ; 30 -> 100
             (history-delete-duplicates minibuffer boolean "22.1")
             (read-buffer-completion-ignore-case minibuffer boolean "23.1")
 
@@ -363,7 +366,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                             left)
                      (const control) (const meta)
                      (const alt) (const hyper)
-                     (const super)) "24.0")
+                     (const super)) "24.1")
             (ns-command-modifier
              ns
              (choice (const :tag "No modifier" nil)
@@ -377,7 +380,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                             left)
                      (const control) (const meta)
                      (const alt) (const hyper)
-                     (const super)) "24.0")
+                     (const super)) "24.1")
             (ns-alternate-modifier
              ns
              (choice (const :tag "No modifier (work as alternate/option)" none)
@@ -399,8 +402,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                      (const alt) (const hyper)
                      (const super)) "23.1")
             (ns-antialias-text ns boolean "23.1")
-            (ns-auto-hide-menu-bar ns boolean "24.0")
+            (ns-auto-hide-menu-bar ns boolean "24.1")
             (ns-use-native-fullscreen ns boolean "24.4")
+            (ns-use-srgb-colorspace ns boolean "24.4")
             ;; process.c
             (delete-exited-processes processes-basics boolean)
             ;; syntax.c