[Emacs-diffs] emacs-25 d4b93e1: Minor fixes in global-auto-composition-mode

[Eli Zaretskii]

branch: emacs-25
commit d4b93e11a519cf71beca69654fda158d01a26c3b
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Minor fixes in global-auto-composition-mode
    
    * lisp/emacs-lisp/easy-mmode.el (easy-mmode-pretty-mode-name):
    Produce prettier names of globalized minor modes.
    * lisp/composite.el (global-auto-composition-mode): Make it a
    globalized mode.  (Bug#22682)
---
 lisp/composite.el             |    1 +
 lisp/emacs-lisp/easy-mmode.el |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/lisp/composite.el b/lisp/composite.el
index 205f5ed..94b14df 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -838,6 +838,7 @@ omitted or nil.
 
 For more information on Auto Composition mode, see
 `auto-composition-mode' ."
+  :global t
   :variable (default-value 'auto-composition-mode))
 
 (defalias 'toggle-auto-composition 'auto-composition-mode)
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index f29f64f..6a4d835 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -68,6 +68,7 @@ replacing its case-insensitive matches with the literal 
string in LIGHTER."
                                     "toggle-\\|-mode\\'" ""
                                      (symbol-name mode))))
                       " mode")))
+    (setq name (replace-regexp-in-string "\\`Global-" "Global " name))
     (if (not (stringp lighter)) name
       ;; Strip leading and trailing whitespace from LIGHTER.
       (setq lighter (replace-regexp-in-string "\\`\\s-+\\|\\s-+\\'" ""