From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 15 Feb 2016 19:46:17 +0000 (+0200)
Subject: Minor fixes in global-auto-composition-mode
X-Git-Tag: emacs-25.0.92~110
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4b93e1;p=emacs.git

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)
---

diff --git a/lisp/composite.el b/lisp/composite.el
index 205f5ed3712..94b14dfc94a 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 f29f64f0562..6a4d835b63c 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-+\\'" ""