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 b446a00bb8f2967e06b5a542f4cc25e206a1f6bc..d4795bfe6a5e138c4db5a7d230a088b644ed2faf 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -404,7 +404,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (ns-antialias-text ns boolean "23.1")
             (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")
+             (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