Merge from emacs-24; up to 2014-07-27T01:00:26Z!fgallina@gnu.org

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index cf94b6300ddecee1f06eee7fd0b87aa581d525f6..d4795bfe6a5e138c4db5a7d230a088b644ed2faf 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)
@@ -272,6 +274,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
@@ -311,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")
 
@@ -362,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)
@@ -376,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)
@@ -398,8 +402,10 @@ 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-fullscreen-animation ns boolean "25.1")
+             (ns-use-srgb-colorspace ns boolean "24.4")
             ;; process.c
             (delete-exited-processes processes-basics boolean)
             ;; syntax.c
@@ -448,6 +454,7 @@ 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
             ;; The whitespace group is for whitespace.el.
             (show-trailing-whitespace editing-basics boolean nil
@@ -457,7 +464,12 @@ since it could result in memory overflow and make Emacs crash."
             (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