diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2010-09-28 01:25:27 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-09-28 01:25:27 +0200 |
| commit | 95b6d681b1121e1be8955aa3f79dd39098edf4cf (patch) | |
| tree | 445d016578b131a7435fac83fc1fbd49f3a45877 /lisp/international | |
| parent | 9f2d52e714dfa161c9c9393075a3bcdf056a4ac8 (diff) | |
| parent | 0cceab3d5942aef608dc33be4616b77206201115 (diff) | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/international')
| -rw-r--r-- | lisp/international/mule-diag.el | 3 | ||||
| -rw-r--r-- | lisp/international/mule.el | 17 |
2 files changed, 11 insertions, 9 deletions
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el index a809b60da7f..ed2f7e33a4c 100644 --- a/lisp/international/mule-diag.el +++ b/lisp/international/mule-diag.el @@ -368,7 +368,8 @@ meanings of these arguments." (when val (if (cadr elt) (insert (cadr elt))) (if (nth 2 elt) - (insert (funcall (nth 2 elt) val))) + (let ((print-length 10) (print-level 2)) + (princ (funcall (nth 2 elt) val) (current-buffer)))) (insert ?\n))))))) ;;; CODING-SYSTEM diff --git a/lisp/international/mule.el b/lisp/international/mule.el index a5775b59b28..151373e27ea 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -635,18 +635,19 @@ VALUE must be a translation table to use on encoding. VALUE must be a function to call after some text is inserted and decoded by the coding system itself and before any functions in -`after-insert-functions' are called. The arguments to this function -are the same as those of a function in `after-insert-file-functions', -i.e. LENGTH of the text to be decoded with point at the head of it, -and the function should leave point unchanged. +`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 +the same, and return the new character count. `:pre-write-conversion' VALUE must be a function to call after all functions in -`write-region-annotate-functions' and `buffer-file-format' are called, -and before the text is encoded by the coding system itself. The -arguments to this function are the same as those of a function in -`write-region-annotate-functions'. +`write-region-annotate-functions' and `buffer-file-format' are +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 funciton is +passed two arguments which can be ignored. `:default-char' |