aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-04-14 11:14:01 -0700
committerGlenn Morris2012-04-14 11:14:01 -0700
commitca7d96c81add66468d99d07d330ba7cc183e07a2 (patch)
tree38c37f9c83075f10571cd335f296f215801b7dad
parent9c2d6a4ab2911db8c7ac531fe49d038df521f55b (diff)
downloademacs-ca7d96c81add66468d99d07d330ba7cc183e07a2.tar.gz
emacs-ca7d96c81add66468d99d07d330ba7cc183e07a2.zip
* lisp/international/mule-cmds.el (set-language-environment): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/international/mule-cmds.el6
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 @@
12012-04-14 Glenn Morris <rgm@gnu.org>
2
3 * international/mule-cmds.el (set-language-environment): Doc fix.
4
12012-04-14 Stefan Monnier <monnier@iro.umontreal.ca> 52012-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:
1838This sets the coding system priority and the default input method 1838This sets the coding system priority and the default input method
1839and sometimes other things. LANGUAGE-NAME should be a string 1839and sometimes other things. LANGUAGE-NAME should be a string
1840which is the name of a language environment. For example, \"Latin-1\" 1840which is the name of a language environment. For example, \"Latin-1\"
1841specifies the character set for the major languages of Western Europe." 1841specifies the character set for the major languages of Western Europe.
1842
1843If there is a prior value for `current-language-environment', this
1844runs the hook `exit-language-environment-hook'. After setting up
1845the 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): ")))