aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/nonascii.texi5
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index be82a760a3e..31b4f7fc255 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12009-10-31 Glenn Morris <rgm@gnu.org>
2
3 * nonascii.texi (User-Chosen Coding Systems): Minor reword. (Bug#4817)
4
12009-10-16 Kevin Ryde <user42@zip.com.au> 52009-10-16 Kevin Ryde <user42@zip.com.au>
2 6
3 * files.texi (Magic File Names): Add @vindex file-name-handler-alist, 7 * files.texi (Magic File Names): Add @vindex file-name-handler-alist,
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index f0ad49cdb7d..d3bbc2c114f 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1231,8 +1231,9 @@ possible candidates.
1231 1231
1232@vindex select-safe-coding-system-accept-default-p 1232@vindex select-safe-coding-system-accept-default-p
1233If the variable @code{select-safe-coding-system-accept-default-p} is 1233If the variable @code{select-safe-coding-system-accept-default-p} is
1234non-@code{nil}, its value overrides the value of 1234non-@code{nil}, it should be a function taking a single argument.
1235@var{accept-default-p}. 1235It is used in place of @var{accept-default-p}, overriding any
1236value supplied for this argument.
1236 1237
1237As a final step, before returning the chosen coding system, 1238As a final step, before returning the chosen coding system,
1238@code{select-safe-coding-system} checks whether that coding system is 1239@code{select-safe-coding-system} checks whether that coding system is