aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/ChangeLog6
-rw-r--r--doc/misc/emacs-mime.texi6
2 files changed, 9 insertions, 3 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 45862f93f0c..8348e628538 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
12013-03-17 Paul Eggert <eggert@cs.ucla.edu>
2
3 doc: convert some TeX accents to UTF-8
4 * emacs-mime.texi (Interface Functions): Use 'ï' rather than
5 '@"{@dotless{i}}'.
6
12013-03-15 Michael Albinus <michael.albinus@gmx.de> 72013-03-15 Michael Albinus <michael.albinus@gmx.de>
2 8
3 Sync with Tramp 2.2.7. 9 Sync with Tramp 2.2.7.
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 5f377e57725..cbb78af9d59 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -1221,7 +1221,7 @@ Return the value of the field under point.
1221@item mail-encode-encoded-word-region 1221@item mail-encode-encoded-word-region
1222@findex mail-encode-encoded-word-region 1222@findex mail-encode-encoded-word-region
1223Encode the non-@acronym{ASCII} words in the region. For instance, 1223Encode the non-@acronym{ASCII} words in the region. For instance,
1224@samp{Na@"{@dotless{i}}ve} is encoded as @samp{=?iso-8859-1?q?Na=EFve?=}. 1224@samp{Naïve} is encoded as @samp{=?iso-8859-1?q?Na=EFve?=}.
1225 1225
1226@item mail-encode-encoded-word-buffer 1226@item mail-encode-encoded-word-buffer
1227@findex mail-encode-encoded-word-buffer 1227@findex mail-encode-encoded-word-buffer
@@ -1234,7 +1234,7 @@ Encode the words that need encoding in a string, and return the result.
1234 1234
1235@example 1235@example
1236(mail-encode-encoded-word-string 1236(mail-encode-encoded-word-string
1237 "This is na@"{@dotless{i}}ve, baby") 1237 "This is naïve, baby")
1238@result{} "This is =?iso-8859-1?q?na=EFve,?= baby" 1238@result{} "This is =?iso-8859-1?q?na=EFve,?= baby"
1239@end example 1239@end example
1240 1240
@@ -1249,7 +1249,7 @@ Decode the encoded words in the string and return the result.
1249@example 1249@example
1250(mail-decode-encoded-word-string 1250(mail-decode-encoded-word-string
1251 "This is =?iso-8859-1?q?na=EFve,?= baby") 1251 "This is =?iso-8859-1?q?na=EFve,?= baby")
1252@result{} "This is na@"{@dotless{i}}ve, baby" 1252@result{} "This is naïve, baby"
1253@end example 1253@end example
1254 1254
1255@end table 1255@end table