summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/cus-start.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e4bf7b893a..ce42d0fcb0d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-11 Jan Djärv <jan.h.d@swipnet.se>
+
+ * cus-start.el (all): Add missing ns to ns-use-fullscreen-animation.
+
2014-10-11 Leo Liu <sdl.web@gmail.com>
* progmodes/cfengine.el (cfengine3-defuns, cfengine3-vartypes):
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index d59bb6732af..43a0fdfe17d 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -404,7 +404,7 @@ 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-fullscreen-animation "25.1")
+ (ns-use-fullscreen-animation ns "25.1")
(ns-use-srgb-colorspace ns boolean "24.4")
;; process.c
(delete-exited-processes processes-basics boolean)