diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/msdog.texi | 23 | ||||
| -rw-r--r-- | doc/lispref/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/lispref/elisp.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/modes.texi | 5 | ||||
| -rw-r--r-- | doc/lispref/nonascii.texi | 58 |
6 files changed, 11 insertions, 88 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 3b7ab6527aa..d2f44eabb0e 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-02-09 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * msdog.texi (Text and Binary): Delete the description of | ||
| 4 | file-name-buffer-file-type-alist. | ||
| 5 | |||
| 1 | 2013-01-19 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2013-01-19 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | * trouble.texi (Crashing): Suggest -p for newer addr2line. (Bug#13445) | 8 | * trouble.texi (Crashing): Suggest -p for newer addr2line. (Bug#13445) |
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index 2c22c89a113..0f01958b51c 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi | |||
| @@ -218,29 +218,6 @@ set conversion, only end-of-line conversion. Essentially, it directs | |||
| 218 | Emacs to create new files with the Unix-style convention of using | 218 | Emacs to create new files with the Unix-style convention of using |
| 219 | newline at the end of a line. @xref{Coding Systems}. | 219 | newline at the end of a line. @xref{Coding Systems}. |
| 220 | 220 | ||
| 221 | @vindex file-name-buffer-file-type-alist | ||
| 222 | @cindex binary files, on MS-DOS/MS-Windows | ||
| 223 | Some kinds of files should not be converted at all, because their | ||
| 224 | contents are not really text. Therefore, Emacs on MS-Windows distinguishes | ||
| 225 | certain files as @dfn{binary files}. (This distinction is not part of | ||
| 226 | MS-Windows; it is made by Emacs only.) Binary files include executable | ||
| 227 | programs, compressed archives, etc. Emacs uses the file name to decide | ||
| 228 | whether to treat a file as binary: the variable | ||
| 229 | @code{file-name-buffer-file-type-alist} defines the file-name patterns | ||
| 230 | that indicate binary files. If a file name matches one of the patterns | ||
| 231 | for binary files (those whose associations are of the type | ||
| 232 | @code{(@var{pattern} . t)}, Emacs reads and writes that file using the | ||
| 233 | @code{no-conversion} coding system (@pxref{Coding Systems}) which turns | ||
| 234 | off @emph{all} coding-system conversions, not only the EOL conversion. | ||
| 235 | @code{file-name-buffer-file-type-alist} also includes file-name patterns | ||
| 236 | for files which are known to be Windows-style text files with | ||
| 237 | carriage-return linefeed EOL format, such as @file{CONFIG.SYS}; Emacs | ||
| 238 | always writes those files with Windows-style EOLs. | ||
| 239 | |||
| 240 | If a file that belongs to an untranslated file system matches one of | ||
| 241 | the file-name patterns in @code{file-name-buffer-file-type-alist}, the | ||
| 242 | EOL conversion is determined by @code{file-name-buffer-file-type-alist}. | ||
| 243 | |||
| 244 | @node Windows Files | 221 | @node Windows Files |
| 245 | @section File Names on MS-Windows | 222 | @section File Names on MS-Windows |
| 246 | @cindex file names on MS-Windows | 223 | @cindex file names on MS-Windows |
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 7c444a038af..90b2349387f 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-02-09 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * modes.texi (%-Constructs): Remove the description of %t. | ||
| 4 | |||
| 5 | * nonascii.texi (MS-DOS File Types): Delete node. | ||
| 6 | |||
| 1 | 2013-02-08 Glenn Morris <rgm@gnu.org> | 7 | 2013-02-08 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * keymaps.texi (Active Keymaps, Searching Keymaps): | 9 | * keymaps.texi (Active Keymaps, Searching Keymaps): |
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 127b22086d0..3d1c4cf577d 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi | |||
| @@ -1209,8 +1209,6 @@ Coding Systems | |||
| 1209 | for a single file operation. | 1209 | for a single file operation. |
| 1210 | * Explicit Encoding:: Encoding or decoding text without doing I/O. | 1210 | * Explicit Encoding:: Encoding or decoding text without doing I/O. |
| 1211 | * Terminal I/O Encoding:: Use of encoding for terminal I/O. | 1211 | * Terminal I/O Encoding:: Use of encoding for terminal I/O. |
| 1212 | * MS-DOS File Types:: How DOS "text" and "binary" files | ||
| 1213 | relate to coding systems. | ||
| 1214 | 1212 | ||
| 1215 | Searching and Matching | 1213 | Searching and Matching |
| 1216 | 1214 | ||
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 29aba877ba2..71ce2bb9271 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi | |||
| @@ -2150,11 +2150,6 @@ visible on screen; or @samp{Bottom} or @samp{All}. | |||
| 2150 | The status of the subprocess belonging to the current buffer, obtained with | 2150 | The status of the subprocess belonging to the current buffer, obtained with |
| 2151 | @code{process-status}. @xref{Process Information}. | 2151 | @code{process-status}. @xref{Process Information}. |
| 2152 | 2152 | ||
| 2153 | @item %t | ||
| 2154 | Whether the visited file is a text file or a binary file. This is a | ||
| 2155 | meaningful distinction only on certain operating systems (@pxref{MS-DOS | ||
| 2156 | File Types}). | ||
| 2157 | |||
| 2158 | @item %z | 2153 | @item %z |
| 2159 | The mnemonics of keyboard, terminal, and buffer coding systems. | 2154 | The mnemonics of keyboard, terminal, and buffer coding systems. |
| 2160 | 2155 | ||
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index 9ad68be60cb..e462c3b4ce4 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi | |||
| @@ -855,8 +855,6 @@ documented here. | |||
| 855 | for a single file operation. | 855 | for a single file operation. |
| 856 | * Explicit Encoding:: Encoding or decoding text without doing I/O. | 856 | * Explicit Encoding:: Encoding or decoding text without doing I/O. |
| 857 | * Terminal I/O Encoding:: Use of encoding for terminal I/O. | 857 | * Terminal I/O Encoding:: Use of encoding for terminal I/O. |
| 858 | * MS-DOS File Types:: How DOS "text" and "binary" files | ||
| 859 | relate to coding systems. | ||
| 860 | @end menu | 858 | @end menu |
| 861 | 859 | ||
| 862 | @node Coding System Basics | 860 | @node Coding System Basics |
| @@ -1775,62 +1773,6 @@ for encoding terminal output from @var{terminal}. If | |||
| 1775 | @code{nil}, that means the currently selected frame's terminal. | 1773 | @code{nil}, that means the currently selected frame's terminal. |
| 1776 | @end deffn | 1774 | @end deffn |
| 1777 | 1775 | ||
| 1778 | @node MS-DOS File Types | ||
| 1779 | @subsection MS-DOS File Types | ||
| 1780 | @cindex DOS file types | ||
| 1781 | @cindex MS-DOS file types | ||
| 1782 | @cindex Windows file types | ||
| 1783 | @cindex file types on MS-DOS and Windows | ||
| 1784 | @cindex text files and binary files | ||
| 1785 | @cindex binary files and text files | ||
| 1786 | |||
| 1787 | On MS-DOS and Microsoft Windows, Emacs guesses the appropriate | ||
| 1788 | end-of-line conversion for a file by looking at the file's name. This | ||
| 1789 | feature classifies files as @dfn{text files} and @dfn{binary files}. By | ||
| 1790 | ``binary file'' we mean a file of literal byte values that are not | ||
| 1791 | necessarily meant to be characters; Emacs does no end-of-line conversion | ||
| 1792 | and no character code conversion for them. On the other hand, the bytes | ||
| 1793 | in a text file are intended to represent characters; when you create a | ||
| 1794 | new file whose name implies that it is a text file, Emacs uses DOS | ||
| 1795 | end-of-line conversion. | ||
| 1796 | |||
| 1797 | @defvar buffer-file-type | ||
| 1798 | This variable, automatically buffer-local in each buffer, records the | ||
| 1799 | file type of the buffer's visited file. When a buffer does not specify | ||
| 1800 | a coding system with @code{buffer-file-coding-system}, this variable is | ||
| 1801 | used to determine which coding system to use when writing the contents | ||
| 1802 | of the buffer. It should be @code{nil} for text, @code{t} for binary. | ||
| 1803 | If it is @code{t}, the coding system is @code{no-conversion}. | ||
| 1804 | Otherwise, @code{undecided-dos} is used. | ||
| 1805 | |||
| 1806 | Normally this variable is set by visiting a file; it is set to | ||
| 1807 | @code{nil} if the file was visited without any actual conversion. | ||
| 1808 | |||
| 1809 | Its default value is used to decide how to handle files for which | ||
| 1810 | @code{file-name-buffer-file-type-alist} says nothing about the type: | ||
| 1811 | If the default value is non-@code{nil}, then these files are treated as | ||
| 1812 | binary: the coding system @code{no-conversion} is used. Otherwise, | ||
| 1813 | nothing special is done for them---the coding system is deduced solely | ||
| 1814 | from the file contents, in the usual Emacs fashion. | ||
| 1815 | @end defvar | ||
| 1816 | |||
| 1817 | @defopt file-name-buffer-file-type-alist | ||
| 1818 | This variable holds an alist for recognizing text and binary files. | ||
| 1819 | Each element has the form (@var{regexp} . @var{type}), where | ||
| 1820 | @var{regexp} is matched against the file name, and @var{type} may be | ||
| 1821 | @code{nil} for text, @code{t} for binary, or a function to call to | ||
| 1822 | compute which. If it is a function, then it is called with a single | ||
| 1823 | argument (the file name) and should return @code{t} or @code{nil}. | ||
| 1824 | |||
| 1825 | When running on MS-DOS or MS-Windows, Emacs checks this alist to decide | ||
| 1826 | which coding system to use when reading a file. For a text file, | ||
| 1827 | @code{undecided-dos} is used. For a binary file, @code{no-conversion} | ||
| 1828 | is used. | ||
| 1829 | |||
| 1830 | If no element in this alist matches a given file name, then | ||
| 1831 | the default value of @code{buffer-file-type} says how to treat the file. | ||
| 1832 | @end defopt | ||
| 1833 | |||
| 1834 | @node Input Methods | 1776 | @node Input Methods |
| 1835 | @section Input Methods | 1777 | @section Input Methods |
| 1836 | @cindex input methods | 1778 | @cindex input methods |