diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:02:45 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:02:45 -0800 |
| commit | 4f7a90bf6ce831063d721324e712f8c38e85c678 (patch) | |
| tree | 73e980746ddc55c4285d145769a94b2845cbfcdf /lisp/international | |
| parent | 620e5a3cd4464aaffaa3568d6f6b89764de5cfbd (diff) | |
| parent | 9adb101353e1f3d41a8f822fa4164e9b41e82ce5 (diff) | |
| download | emacs-4f7a90bf6ce831063d721324e712f8c38e85c678.tar.gz | |
Merge from origin/emacs-25
9adb101 Document 'describe-fontset'
229315c ; Add missing symbol quoting.
3d94931 Repair desktop restoration on text terminals
43022f9 Ignore forward-sexp-function in js-mode indentation code
b19fb49 Improve documentation of 'define-coding-system'
467768f Fix Bug#25162
6db78ae Fix a typo in define-abbrev-table
5f7d906 Bump makeinfo requirement from 4.7 to 4.13
442e2f6 Fixes related to select-enable-clipboard
e4ac450 Define struct predicate before acccesors
08decbd Doc fix for vc-git
5531e75 Further improve make-dist checking
953bf67 Improve previous make-dist change
129645a Make make-dist --snapshot do some sanity checks
# Conflicts:
# lisp/menu-bar.el
Diffstat (limited to 'lisp/international')
| -rw-r--r-- | lisp/international/mule.el | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 5bc0e9c4c34..0761e688684 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -713,7 +713,11 @@ decoded by the coding system itself and before any functions in `after-insert-functions' are called. This function is passed one argument: the number of characters in the text to convert, with point at the start of the text. The function should leave point -unchanged, and should return the new character count. +unchanged, and should return the new character count. Note that +this function should avoid reading from files or receiving text +from subprocesses -- anything that could invoke decoding; if it +must do so, it should bind `coding-system-for-read' to a value +other than the current coding-system, to avoid infinite recursion. `:pre-write-conversion' @@ -722,7 +726,12 @@ VALUE must be a function to call after all functions in called, and before the text is encoded by the coding system itself. This function should convert the whole text in the current buffer. For backward compatibility, this function is -passed two arguments which can be ignored. +passed two arguments which can be ignored. Note that this +function should avoid writing to files or sending text to +subprocesses -- anything that could invoke encoding; if it +must do so, it should bind `coding-system-for-write' to a +value other than the current coding-system, to avoid infinite +recursion. `:default-char' |