diff options
author | Chong Yidong <cyd@gnu.org> | 2012-06-17 13:13:40 +0800 |
---|---|---|
committer | Chong Yidong <cyd@gnu.org> | 2012-06-17 13:13:40 +0800 |
commit | 41b7f8bc6c4511ab6fcf7f6b1f9e7fdcd8592821 (patch) | |
tree | 83b5228b63fe4bf45ec71aa25b5a21ab6aff3676 /lisp/international/mule-cmds.el | |
parent | 82a25657c58b7a5ad2f6d247aa91e11f0b2a783b (diff) | |
parent | 05c44a7512ba0da34f7e6c3869c22f2f3517d255 (diff) | |
download | emacs-41b7f8bc6c4511ab6fcf7f6b1f9e7fdcd8592821.tar.gz |
Merge changes from emacs-24; up to 2012-04-26T02:03:19Z!ueno@unixuser.org
Diffstat (limited to 'lisp/international/mule-cmds.el')
-rw-r--r-- | lisp/international/mule-cmds.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 6ec5e2302a2..0f3d8c2d2bf 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -129,10 +129,10 @@ `(menu-item ,(purecopy "Set Coding Systems") ,set-coding-system-map :enable (default-value 'enable-multibyte-characters))) (define-key-after map [view-hello-file] - `(menu-item ,(purecopy "Show Multi-lingual Text") view-hello-file + `(menu-item ,(purecopy "Show Multilingual Sample Text") view-hello-file :enable (file-readable-p (expand-file-name "HELLO" data-directory)) - :help ,(purecopy "Display file which says HELLO in many languages"))) + :help ,(purecopy "Demonstrate various character sets"))) (define-key-after map [separator-coding-system] menu-bar-separator) (define-key-after map [describe-language-environment] @@ -148,7 +148,7 @@ `(menu-item ,(purecopy "List Character Sets") list-character-sets :help ,(purecopy "Show table of available character sets"))) (define-key-after map [mule-diag] - `(menu-item ,(purecopy "Show All of Mule Status") mule-diag + `(menu-item ,(purecopy "Show All Multilingual Settings") mule-diag :help ,(purecopy "Display multilingual environment settings"))) map) "Keymap for Mule (Multilingual environment) menu specific commands.") @@ -1828,7 +1828,7 @@ The default status is as follows: (set-terminal-coding-system (or coding-system coding) display))) (defun set-language-environment (language-name) - "Set up multi-lingual environment for using LANGUAGE-NAME. + "Set up multilingual environment for using LANGUAGE-NAME. This sets the coding system priority and the default input method and sometimes other things. LANGUAGE-NAME should be a string which is the name of a language environment. For example, \"Latin-1\" @@ -2500,7 +2500,7 @@ For example, translate \"swedish\" into \"sv_SE.ISO8859-1\"." locale)) (defun set-locale-environment (&optional locale-name frame) - "Set up multi-lingual environment for using LOCALE-NAME. + "Set up multilingual environment for using LOCALE-NAME. This sets the language environment, the coding system priority, the default input method and sometimes other things. |