aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJan Djärv2014-10-11 21:58:02 +0200
committerJan Djärv2014-10-11 21:58:02 +0200
commitf98021b18babdf19d7c7a329647d028717ae90c6 (patch)
tree5688b689db15a7f6a3eb3d2f6e7c462f101ec27f /lisp
parent541961c945a3e7061b23bc07dae758ab911cc61d (diff)
downloademacs-f98021b18babdf19d7c7a329647d028717ae90c6.tar.gz
emacs-f98021b18babdf19d7c7a329647d028717ae90c6.zip
* cus-start.el (all): Add missing ns to ns-use-fullscreen-animation.
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 @@
12014-10-11 Jan Djärv <jan.h.d@swipnet.se>
2
3 * cus-start.el (all): Add missing ns to ns-use-fullscreen-animation.
4
12014-10-11 Leo Liu <sdl.web@gmail.com> 52014-10-11 Leo Liu <sdl.web@gmail.com>
2 6
3 * progmodes/cfengine.el (cfengine3-defuns, cfengine3-vartypes): 7 * 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
404 (ns-antialias-text ns boolean "23.1") 404 (ns-antialias-text ns boolean "23.1")
405 (ns-auto-hide-menu-bar ns boolean "24.1") 405 (ns-auto-hide-menu-bar ns boolean "24.1")
406 (ns-use-native-fullscreen ns boolean "24.4") 406 (ns-use-native-fullscreen ns boolean "24.4")
407 (ns-use-fullscreen-animation "25.1") 407 (ns-use-fullscreen-animation ns "25.1")
408 (ns-use-srgb-colorspace ns boolean "24.4") 408 (ns-use-srgb-colorspace ns boolean "24.4")
409 ;; process.c 409 ;; process.c
410 (delete-exited-processes processes-basics boolean) 410 (delete-exited-processes processes-basics boolean)