diff options
| author | Miles Bader | 2006-05-10 20:42:41 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-05-10 20:42:41 +0000 |
| commit | 3bcf2b084a0dd1ff0399480d57b87e01cfe061dc (patch) | |
| tree | 355c68cda5a5c9c73824840df3cdae6320017283 /src/coding.h | |
| parent | 0ea38cf9dca8f2b148d78f638eed17e8896984af (diff) | |
| parent | d105bfecce2288cd99f591382586a22a4ce1b6f2 (diff) | |
| download | emacs-3bcf2b084a0dd1ff0399480d57b87e01cfe061dc.tar.gz emacs-3bcf2b084a0dd1ff0399480d57b87e01cfe061dc.zip | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-60
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 259-273)
- Update from CVS
- lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t
- Merge from gnus--rel--5.10
- Rename "field-at-point" to "field-at-pos"
- (comint-insert-input): Remove redundant calls to setq and goto-char
* gnus--rel--5.10 (patch 99-100)
- Merge from emacs--devo--0
- Update from CVS
Diffstat (limited to 'src/coding.h')
| -rw-r--r-- | src/coding.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/coding.h b/src/coding.h index 41f4aab509c..aa5c8f05015 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -717,6 +717,9 @@ extern Lisp_Object eol_mnemonic_unix, eol_mnemonic_dos, eol_mnemonic_mac; | |||
| 717 | /* Mnemonic string to indicate type of end-of-line is not yet decided. */ | 717 | /* Mnemonic string to indicate type of end-of-line is not yet decided. */ |
| 718 | extern Lisp_Object eol_mnemonic_undecided; | 718 | extern Lisp_Object eol_mnemonic_undecided; |
| 719 | 719 | ||
| 720 | /* Format of end-of-line decided by system. */ | ||
| 721 | extern int system_eol_type; | ||
| 722 | |||
| 720 | #ifdef emacs | 723 | #ifdef emacs |
| 721 | extern Lisp_Object Qfile_coding_system; | 724 | extern Lisp_Object Qfile_coding_system; |
| 722 | extern Lisp_Object Qcall_process, Qcall_process_region; | 725 | extern Lisp_Object Qcall_process, Qcall_process_region; |