authors.el: Add some renamed/moved files

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index b954ed6..2da6711 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
@@ -252,7 +252,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (use-file-dialog menu boolean "22.1")
             (focus-follows-mouse frames boolean "20.3")
             ;; fontset.c
-            (vertical-centering-font-regexp display regexp)
+            ;; FIXME nil is the initial value, fontset.el setqs it.
+            (vertical-centering-font-regexp display
+                                            (choice (const nil) regexp))
             ;; frame.c
             (default-frame-alist frames
               (repeat (cons :format "%v"
@@ -270,6 +272,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (tool-bar-mode (frames mouse) boolean nil
 ;                          :initialize custom-initialize-default
                            :set custom-set-minor-mode)
+            (frame-resize-pixelwise windows boolean "24.4")
             ;; fringe.c
             (overflow-newline-into-fringe fringe boolean)
             ;; image.c
@@ -286,7 +289,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (double-click-time mouse (restricted-sexp
                                       :match-alternatives (integerp 'nil 't)))
             (double-click-fuzz mouse integer "22.1")
-            (inhibit-local-menu-bar-menus menu boolean)
             (help-char keyboard character)
             (help-event-list keyboard (repeat (sexp :format "%v")))
             (menu-prompting menu boolean)
@@ -301,15 +303,16 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                      (const :tag "When sent SIGUSR2" sigusr2))
                              "24.1")
 
-;; This is not good news because it will use the wrong
-;; version-specific directories when you upgrade.  We need
-;; customization of the front of the list, maintaining the standard
-;; value intact at the back.
-;;;         (load-path environment
-;;;                    (repeat (choice :tag "[Current dir?]"
-;;;                                    :format "%[Current dir?%] %v"
-;;;                                    (const :tag " current dir" nil)
-;;;                                    (directory :format "%v"))))
+             ;; This is not good news because it will use the wrong
+             ;; version-specific directories when you upgrade.  We need
+             ;; customization of the front of the list, maintaining the
+             ;; standard value intact at the back.
+            ;;(load-path environment
+            ;;         (repeat (choice :tag "[Current dir?]"
+            ;;                         :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
@@ -361,7 +364,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)
@@ -375,7 +378,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)
@@ -397,7 +400,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
@@ -446,15 +451,22 @@ since it could result in memory overflow and make Emacs crash."
                              :value display-buffer)
                       (other :tag "Always (t)" :value t))
              "24.3")
+            (window-resize-pixelwise windows boolean "24.4")
             ;; xdisp.c
-            (show-trailing-whitespace whitespace-faces boolean nil
+            ;; The whitespace group is for whitespace.el.
+            (show-trailing-whitespace editing-basics boolean nil
                                       :safe booleanp)
             (scroll-step windows integer)
             (scroll-conservatively windows integer)
             (scroll-margin windows integer)
             (hscroll-margin windows integer "22.1")
             (hscroll-step windows number "22.1")
-            (truncate-partial-width-windows display boolean "23.1")
+            (truncate-partial-width-windows
+             display
+             (choice (integer :tag "Truncate if narrower than")
+                     (const :tag "Respect `truncate-lines'" nil)
+                     (other :tag "Truncate if not full-width" t))
+             "23.1")
             (make-cursor-line-fully-visible windows boolean)
             (mode-line-in-non-selected-windows mode-line boolean "22.1")
             (line-number-display-limit display
@@ -513,6 +525,7 @@ since it could result in memory overflow and make Emacs crash."
             (x-use-underline-position-properties display boolean "22.1")
             (x-underline-at-descent-line display boolean "22.1")
             (x-stretch-cursor display boolean "21.1")
+            (scroll-bar-adjust-thumb-portion windows boolean "24.4")
             ;; xselect.c
             (x-select-enable-clipboard-manager killing boolean "24.1")
             ;; xsettings.c
@@ -575,6 +588,9 @@ since it could result in memory overflow and make Emacs crash."
                              (symbol-name symbol))
                       ;; Any function from fontset.c will do.
                       (fboundp 'new-fontset))
+                     ((equal "scroll-bar-adjust-thumb-portion"
+                             (symbol-name symbol))
+                      (featurep 'x))
                      (t t))))
     (if (not (boundp symbol))
        ;; If variables are removed from C code, give an error here!