Merge from emacs--devo--0

[gnu-emacs] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 24c29f52a86858fd83c779edbe8cdf3d85f1b56a..8ab50efa877d7989a09204d503367b22d13cb93c 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -837,6 +837,7 @@ opening the first frame (e.g. open a connection to an X server).")
   (custom-reevaluate-setting 'file-name-shadow-mode)
   (custom-reevaluate-setting 'send-mail-function)
   (custom-reevaluate-setting 'focus-follows-mouse)
+  (custom-reevaluate-setting 'global-auto-composition-mode)
 
   (normal-erase-is-backspace-setup-frame)