diff options
| author | Glenn Morris | 2014-05-14 10:01:29 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-05-14 10:01:29 -0700 |
| commit | f4da4720dfdefbdace402201c6a5fc8017bb98aa (patch) | |
| tree | ff0ad3d49398cca6c22b9061742d95fc1b0a9eae /doc | |
| parent | 6f1d9822d972c418dbf2295fcd01b7b0a3dc5ef8 (diff) | |
| parent | 34cba8e885f2ed1c0e9c805ad89b9464e0b5766a (diff) | |
| download | emacs-f4da4720dfdefbdace402201c6a5fc8017bb98aa.tar.gz emacs-f4da4720dfdefbdace402201c6a5fc8017bb98aa.zip | |
Merge from emacs-24; up to 2014-05-15T16:55:18Z!jan.h.d@swipnet.se
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/mule.texi | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 7bcd720203f..afb8782ac75 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-05-14 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * mule.texi (Language Environments): Remove unused @anchor. (Bug#17479) | ||
| 4 | |||
| 1 | 2014-05-04 Eli Zaretskii <eliz@gnu.org> | 5 | 2014-05-04 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * trouble.texi (Lossage, DEL Does Not Delete, Stuck Recursive) | 7 | * trouble.texi (Lossage, DEL Does Not Delete, Stuck Recursive) |
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index 839bd95ae5e..27c10c9f60a 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi | |||
| @@ -439,7 +439,6 @@ character sets, coding systems, and input methods that go with it. It | |||
| 439 | also shows some sample text to illustrate scripts used in this | 439 | also shows some sample text to illustrate scripts used in this |
| 440 | language environment. If you give an empty input for @var{lang-env}, | 440 | language environment. If you give an empty input for @var{lang-env}, |
| 441 | this command describes the chosen language environment. | 441 | this command describes the chosen language environment. |
| 442 | @anchor{Describe Language Environment} | ||
| 443 | 442 | ||
| 444 | @vindex set-language-environment-hook | 443 | @vindex set-language-environment-hook |
| 445 | You can customize any language environment with the normal hook | 444 | You can customize any language environment with the normal hook |