Update copyright year to 2015

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index d4795bfe6a5e138c4db5a7d230a088b644ed2faf..299b18d0118857bd4fe3abe1fbc1fcbcb87fba86 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-2014 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999-2015 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
@@ -274,7 +274,13 @@ 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")
+            (frame-resize-pixelwise frames boolean "24.4")
+            (frame-inhibit-implied-resize frames
+                                          (choice
+                                           (const :tag "Never" nil)
+                                           (const :tag "Always" t)
+                                           (repeat (symbol :tag "Parameter")))
+                                          "25.1")
             ;; fringe.c
             (overflow-newline-into-fringe fringe boolean)
             ;; image.c
@@ -454,6 +460,7 @@ since it could result in memory overflow and make Emacs crash."
                              :value display-buffer)
                       (other :tag "Always (t)" :value t))
              "24.3")
+            (fast-but-imprecise-scrolling scrolling boolean "25.1")
             (window-resize-pixelwise windows boolean "24.4")
             ;; xdisp.c
             ;; The whitespace group is for whitespace.el.
@@ -513,7 +520,12 @@ since it could result in memory overflow and make Emacs crash."
                                      (const :tag "Hourglass" :value hourglass)))
             (display-hourglass cursor boolean)
             (hourglass-delay cursor number)
-
+            (resize-mini-windows
+             windows (choice
+                      (const :tag "Off (nil)" :value nil)
+                      (const :tag "Fit (t)" :value t)
+                      (const :tag "Grow only" :value grow-only))
+             "25.1")
             ;; xfaces.c
             (scalable-fonts-allowed display boolean "22.1")
             ;; xfns.c
@@ -522,7 +534,6 @@ since it could result in memory overflow and make Emacs crash."
             (x-gtk-use-old-file-dialog menu boolean "22.1")
             (x-gtk-show-hidden-files menu boolean "22.1")
             (x-gtk-file-dialog-help-text menu boolean "22.1")
-            (x-gtk-whole-detached-tool-bar x boolean "22.1")
             (x-gtk-use-system-tooltips tooltip boolean "23.3")
             ;; xterm.c
             (x-use-underline-position-properties display boolean "22.1")