diff options
| author | Glenn Morris | 2012-04-14 11:14:01 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-04-14 11:14:01 -0700 |
| commit | ca7d96c81add66468d99d07d330ba7cc183e07a2 (patch) | |
| tree | 38c37f9c83075f10571cd335f296f215801b7dad | |
| parent | 9c2d6a4ab2911db8c7ac531fe49d038df521f55b (diff) | |
| download | emacs-ca7d96c81add66468d99d07d330ba7cc183e07a2.tar.gz emacs-ca7d96c81add66468d99d07d330ba7cc183e07a2.zip | |
* lisp/international/mule-cmds.el (set-language-environment): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index caa11a84442..94e9044b2d6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-04-14 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * international/mule-cmds.el (set-language-environment): Doc fix. | ||
| 4 | |||
| 1 | 2012-04-14 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2012-04-14 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | Avoid the use of ((lambda ...) ...) in lexical-binding code. | 7 | Avoid the use of ((lambda ...) ...) in lexical-binding code. |
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index debc328c551..0e1640ffef5 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el | |||
| @@ -1838,7 +1838,11 @@ The default status is as follows: | |||
| 1838 | This sets the coding system priority and the default input method | 1838 | This sets the coding system priority and the default input method |
| 1839 | and sometimes other things. LANGUAGE-NAME should be a string | 1839 | and sometimes other things. LANGUAGE-NAME should be a string |
| 1840 | which is the name of a language environment. For example, \"Latin-1\" | 1840 | which is the name of a language environment. For example, \"Latin-1\" |
| 1841 | specifies the character set for the major languages of Western Europe." | 1841 | specifies the character set for the major languages of Western Europe. |
| 1842 | |||
| 1843 | If there is a prior value for `current-language-environment', this | ||
| 1844 | runs the hook `exit-language-environment-hook'. After setting up | ||
| 1845 | the new language environment, it runs `set-language-environment-hook'." | ||
| 1842 | (interactive (list (read-language-name | 1846 | (interactive (list (read-language-name |
| 1843 | nil | 1847 | nil |
| 1844 | "Set language environment (default English): "))) | 1848 | "Set language environment (default English): "))) |