summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
+2012-04-14 Glenn Morris <rgm@gnu.org>
+
+ * international/mule-cmds.el (set-language-environment): Doc fix.
+
2012-04-14 Stefan Monnier <monnier@iro.umontreal.ca>
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:
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\"
-specifies the character set for the major languages of Western Europe."
+specifies the character set for the major languages of Western Europe.
+
+If there is a prior value for `current-language-environment', this
+runs the hook `exit-language-environment-hook'. After setting up
+the new language environment, it runs `set-language-environment-hook'."
(interactive (list (read-language-name
nil
"Set language environment (default English): ")))