Update copyright year to 2015

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 3b8885a8717e240bced42a70df8203914ba13911..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
@@ -460,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.
@@ -519,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