aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2016-02-15 21:46:17 +0200
committerEli Zaretskii2016-02-15 21:46:17 +0200
commitd4b93e11a519cf71beca69654fda158d01a26c3b (patch)
tree59abc49fcedc1e74856f63913232d97cea1a82bd
parent02b037b85ce32fdcf454f5b12d72f09bcb217891 (diff)
downloademacs-d4b93e11a519cf71beca69654fda158d01a26c3b.tar.gz
emacs-d4b93e11a519cf71beca69654fda158d01a26c3b.zip
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)
-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.
838 838
839For more information on Auto Composition mode, see 839For more information on Auto Composition mode, see
840`auto-composition-mode' ." 840`auto-composition-mode' ."
841 :global t
841 :variable (default-value 'auto-composition-mode)) 842 :variable (default-value 'auto-composition-mode))
842 843
843(defalias 'toggle-auto-composition 'auto-composition-mode) 844(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."
68 "toggle-\\|-mode\\'" "" 68 "toggle-\\|-mode\\'" ""
69 (symbol-name mode)))) 69 (symbol-name mode))))
70 " mode"))) 70 " mode")))
71 (setq name (replace-regexp-in-string "\\`Global-" "Global " name))
71 (if (not (stringp lighter)) name 72 (if (not (stringp lighter)) name
72 ;; Strip leading and trailing whitespace from LIGHTER. 73 ;; Strip leading and trailing whitespace from LIGHTER.
73 (setq lighter (replace-regexp-in-string "\\`\\s-+\\|\\s-+\\'" "" 74 (setq lighter (replace-regexp-in-string "\\`\\s-+\\|\\s-+\\'" ""