aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2007-05-22 11:24:50 +0000
committerEli Zaretskii2007-05-22 11:24:50 +0000
commit4d55e513d9e8bbae1b3a85af9a41d37a7ee61298 (patch)
tree88799da93845d7a9ea3ba696704b33063ce1e33a
parent784b0db628b5f081bf77d118cd0c9176b7ed798c (diff)
downloademacs-4d55e513d9e8bbae1b3a85af9a41d37a7ee61298.tar.gz
emacs-4d55e513d9e8bbae1b3a85af9a41d37a7ee61298.zip
(find-buffer-file-type-coding-system): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/dos-w32.el6
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 72e0d260606..2ec6ae659e9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-05-22 Eli Zaretskii <eliz@gnu.org>
2
3 * dos-w32.el (find-buffer-file-type-coding-system): Doc fix.
4
12007-05-22 Juanma Barranquero <lekktu@gmail.com> 52007-05-22 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * emacs-lisp/easy-mmode.el (define-minor-mode) 7 * emacs-lisp/easy-mmode.el (define-minor-mode)
diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el
index aeebb9c3d08..b1dc399418a 100644
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -92,7 +92,7 @@ against the file name, and TYPE is nil for text, t for binary.")
92 92
93(defun find-buffer-file-type-coding-system (command) 93(defun find-buffer-file-type-coding-system (command)
94 "Choose a coding system for a file operation in COMMAND. 94 "Choose a coding system for a file operation in COMMAND.
95COMMAND is a list that specifies the operation, and I/O primitive as its 95COMMAND is a list that specifies the operation, an I/O primitive, as its
96CAR, and the arguments that might be given to that operation as its CDR. 96CAR, and the arguments that might be given to that operation as its CDR.
97If operation is `insert-file-contents', the coding system is chosen based 97If operation is `insert-file-contents', the coding system is chosen based
98upon the filename (the CAR of the arguments beyond the operation), the contents 98upon the filename (the CAR of the arguments beyond the operation), the contents
@@ -109,6 +109,10 @@ and whether the file exists:
109 If the file exists: `undecided' 109 If the file exists: `undecided'
110 If the file does not exist: default-buffer-file-coding-system 110 If the file does not exist: default-buffer-file-coding-system
111 111
112Note that the CAR of arguments to `insert-file-contents' operation could
113be a cons cell of the form \(FILENAME . BUFFER\), where BUFFER is a buffer
114into which the file's contents were already read, but not yet decoded.
115
112If operation is `write-region', the coding system is chosen based upon 116If operation is `write-region', the coding system is chosen based upon
113the value of `buffer-file-coding-system' and `buffer-file-type'. If 117the value of `buffer-file-coding-system' and `buffer-file-type'. If
114`buffer-file-coding-system' is non-nil, its value is used. If it is 118`buffer-file-coding-system' is non-nil, its value is used. If it is