aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/international/mule-cmds.el6
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 717ad6d94f5..87d62690f7c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * international/mule-cmds.el (prefer-coding-system): Add an
4 example (bug#4869).
5
3 * progmodes/etags.el (tags-search): Document `file-list-form' 6 * progmodes/etags.el (tags-search): Document `file-list-form'
4 (bug#4731). 7 (bug#4731).
5 8
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index e75a22d6415..6a73aaaa838 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -397,7 +397,11 @@ If CODING-SYSTEM specifies a certain type of EOL conversion, the coding
397systems set by this function will use that type of EOL conversion. 397systems set by this function will use that type of EOL conversion.
398 398
399A coding system that requires automatic detection of text+encoding 399A coding system that requires automatic detection of text+encoding
400\(e.g. undecided, unix) can't be preferred." 400\(e.g. undecided, unix) can't be preferred.
401
402To prefer, for instance, utf-8, say the following:
403
404 \(prefer-coding-system 'utf-8)"
401 (interactive "zPrefer coding system: ") 405 (interactive "zPrefer coding system: ")
402 (if (not (and coding-system (coding-system-p coding-system))) 406 (if (not (and coding-system (coding-system-p coding-system)))
403 (error "Invalid coding system `%s'" coding-system)) 407 (error "Invalid coding system `%s'" coding-system))