aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-04-11 21:23:34 -0700
committerGlenn Morris2012-04-11 21:23:34 -0700
commite0550caef5dbc1c586c303c3a87934a49d2fae14 (patch)
tree43a9982bbce73ffdd5ce294b171ade2d39593206
parent8edb942b9f5a1bd8615c3e5bbb018ab3b59e204f (diff)
downloademacs-e0550caef5dbc1c586c303c3a87934a49d2fae14.tar.gz
emacs-e0550caef5dbc1c586c303c3a87934a49d2fae14.zip
* doc/emacs/mule.texi (Language Environments): Copyedits.
-rw-r--r--doc/emacs/ChangeLog2
-rw-r--r--doc/emacs/mule.texi38
2 files changed, 25 insertions, 15 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index e69a0e90ec8..bd77e1232e2 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -6,6 +6,8 @@
6 Clarify what "unibyte: t" does, and mode-line description. 6 Clarify what "unibyte: t" does, and mode-line description.
7 (Unibyte Mode): Update for "Disabling Multibyte" node name change. 7 (Unibyte Mode): Update for "Disabling Multibyte" node name change.
8 Use Texinfo recommended convention for quotes+punctuation. 8 Use Texinfo recommended convention for quotes+punctuation.
9 (Language Environments): Copyedits.
10
9 * custom.texi (Specifying File Variables): Fix "unibyte" description. 11 * custom.texi (Specifying File Variables): Fix "unibyte" description.
10 Update for "Disabling Multibyte" node name change. 12 Update for "Disabling Multibyte" node name change.
11 * emacs.texi: Update for "Disabling Multibyte" node name change. 13 * emacs.texi: Update for "Disabling Multibyte" node name change.
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 16fec0961bf..a15448fbb15 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -326,8 +326,8 @@ command @code{toggle-enable-multibyte-characters} in that buffer.
326 326
327 All supported character sets are supported in Emacs buffers whenever 327 All supported character sets are supported in Emacs buffers whenever
328multibyte characters are enabled; there is no need to select a 328multibyte characters are enabled; there is no need to select a
329particular language in order to display its characters in an Emacs 329particular language in order to display its characters.
330buffer. However, it is important to select a @dfn{language 330However, it is important to select a @dfn{language
331environment} in order to set various defaults. Roughly speaking, the 331environment} in order to set various defaults. Roughly speaking, the
332language environment represents a choice of preferred script rather 332language environment represents a choice of preferred script rather
333than a choice of language. 333than a choice of language.
@@ -344,7 +344,8 @@ language environment also specifies a default input method.
344@code{current-language-environment} or use the command @kbd{M-x 344@code{current-language-environment} or use the command @kbd{M-x
345set-language-environment}. It makes no difference which buffer is 345set-language-environment}. It makes no difference which buffer is
346current when you use this command, because the effects apply globally 346current when you use this command, because the effects apply globally
347to the Emacs session. The supported language environments include: 347to the Emacs session. The supported language environments
348(see the variable @code{language-info-alist}) include:
348 349
349@cindex Euro sign 350@cindex Euro sign
350@cindex UTF-8 351@cindex UTF-8
@@ -368,11 +369,15 @@ which prefers Cyrillic characters and files encoded in Windows-1255).
368@cindex Intlfonts package, installation 369@cindex Intlfonts package, installation
369 To display the script(s) used by your language environment on a 370 To display the script(s) used by your language environment on a
370graphical display, you need to have a suitable font. If some of the 371graphical display, you need to have a suitable font. If some of the
371characters appear as empty boxes or hex codes, you should install the 372characters appear as empty boxes or hex codes, you should install
373extra fonts. Your operating system may have optional fonts that
374you can install; or you can install the
372GNU Intlfonts package, which includes fonts for most supported 375GNU Intlfonts package, which includes fonts for most supported
373scripts.@footnote{If you run Emacs on X, you need to inform the X 376scripts.@footnote{If you run Emacs on X, you may need to inform the X
374server about the location of the newly installed fonts with the 377server about the location of the newly installed fonts with
375following commands: 378commands such as:
379@c FIXME? I feel like this may be out of date.
380@c Eg the intlfonts tarfile is ~ 10 years old.
376 381
377@example 382@example
378 xset fp+ /usr/local/share/emacs/fonts 383 xset fp+ /usr/local/share/emacs/fonts
@@ -387,22 +392,25 @@ following commands:
387@cindex locales 392@cindex locales
388 Some operating systems let you specify the character-set locale you 393 Some operating systems let you specify the character-set locale you
389are using by setting the locale environment variables @env{LC_ALL}, 394are using by setting the locale environment variables @env{LC_ALL},
390@env{LC_CTYPE}, or @env{LANG}.@footnote{If more than one of these is 395@env{LC_CTYPE}, or @env{LANG}. (If more than one of these is
391set, the first one that is nonempty specifies your locale for this 396set, the first one that is nonempty specifies your locale for this
392purpose.} During startup, Emacs looks up your character-set locale's 397purpose.) During startup, Emacs looks up your character-set locale's
393name in the system locale alias table, matches its canonical name 398name in the system locale alias table, matches its canonical name
394against entries in the value of the variables 399against entries in the value of the variables
395@code{locale-charset-language-names} and @code{locale-language-names}, 400@code{locale-charset-language-names} and @code{locale-language-names}
401(the former overrides the latter),
396and selects the corresponding language environment if a match is found. 402and selects the corresponding language environment if a match is found.
397(The former variable overrides the latter.) It also adjusts the display 403It also adjusts the display
398table and terminal coding system, the locale coding system, the 404table and terminal coding system, the locale coding system, the
399preferred coding system as needed for the locale, and---last but not 405preferred coding system as needed for the locale, and---last but not
400least---the way Emacs decodes non-@acronym{ASCII} characters sent by your keyboard. 406least---the way Emacs decodes non-@acronym{ASCII} characters sent by your keyboard.
401 407
408@c This seems unlikely, doesn't it?
402 If you modify the @env{LC_ALL}, @env{LC_CTYPE}, or @env{LANG} 409 If you modify the @env{LC_ALL}, @env{LC_CTYPE}, or @env{LANG}
403environment variables while running Emacs, you may want to invoke the 410environment variables while running Emacs (by using @kbd{M-x setenv}),
404@code{set-locale-environment} function afterwards to readjust the 411you may want to invoke the @code{set-locale-environment}
405language environment from the new locale. 412function afterwards to readjust the language environment from the new
413locale.
406 414
407@vindex locale-preferred-coding-systems 415@vindex locale-preferred-coding-systems
408 The @code{set-locale-environment} function normally uses the preferred 416 The @code{set-locale-environment} function normally uses the preferred
@@ -438,7 +446,7 @@ this command describes the chosen language environment.
438language environment. The hook functions can test for a specific 446language environment. The hook functions can test for a specific
439language environment by checking the variable 447language environment by checking the variable
440@code{current-language-environment}. This hook is where you should 448@code{current-language-environment}. This hook is where you should
441put non-default settings for specific language environment, such as 449put non-default settings for specific language environments, such as
442coding systems for keyboard input and terminal output, the default 450coding systems for keyboard input and terminal output, the default
443input method, etc. 451input method, etc.
444 452