summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2016-02-15 21:46:17 +0200
committerEli Zaretskii <eliz@gnu.org>2016-02-15 21:46:17 +0200
commitd4b93e11a519cf71beca69654fda158d01a26c3b (patch)
tree59abc49fcedc1e74856f63913232d97cea1a82bd /lisp
parent02b037b85ce32fdcf454f5b12d72f09bcb217891 (diff)
downloademacs-d4b93e11a519cf71beca69654fda158d01a26c3b.tar.gz
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)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/composite.el1
-rw-r--r--lisp/emacs-lisp/easy-mmode.el1
2 files changed, 2 insertions, 0 deletions
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-+\\'" ""