Merge from emacs--devo--0

[gnu-emacs] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index e67c98803cc4ca266d0a647eef383b809bd96417..a3c0a25511f7faddfcf5f6744d7d1224a45e79af 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -838,6 +838,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)