diff options
| author | Joakim Verona | 2013-05-27 23:14:19 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-05-27 23:14:19 +0200 |
| commit | 5cf62a1639c5993c1fd6b532f92325b28a13ee79 (patch) | |
| tree | d67d1c7c583947f164ee7494601d5c9decbd6b0f /src/coding.h | |
| parent | 3b2a9bcfc08c74d95f46d634fadc758decb1c2b0 (diff) | |
| parent | 6ef3db10430c653e302ca5983ade6f8eaa186f85 (diff) | |
| download | emacs-5cf62a1639c5993c1fd6b532f92325b28a13ee79.tar.gz emacs-5cf62a1639c5993c1fd6b532f92325b28a13ee79.zip | |
Merge remote-tracking branch 'origin/trunk' into xwidget
Conflicts:
ChangeLog
lisp/ChangeLog
lisp/progmodes/octave.el
src/Makefile.in
Diffstat (limited to 'src/coding.h')
| -rw-r--r-- | src/coding.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/coding.h b/src/coding.h index d40209be68f..d13fd42fe4f 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -444,6 +444,8 @@ struct coding_system | |||
| 444 | the eol format. */ | 444 | the eol format. */ |
| 445 | ptrdiff_t head_ascii; | 445 | ptrdiff_t head_ascii; |
| 446 | 446 | ||
| 447 | ptrdiff_t detected_utf8_chars; | ||
| 448 | |||
| 447 | /* Used internally in coding.c. See the comment of detect_ascii. */ | 449 | /* Used internally in coding.c. See the comment of detect_ascii. */ |
| 448 | int eol_seen; | 450 | int eol_seen; |
| 449 | 451 | ||