diff options
| author | Dmitry Antipov | 2012-12-26 13:40:45 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-12-26 13:40:45 +0400 |
| commit | 4b298d5a3e0d5fb75f66c48598e80122669cef8b (patch) | |
| tree | 747aaa0665af3e8d69c8ea89f043de1c32cdf5b9 /src/coding.c | |
| parent | a8e1690bbde896247359c967b15b6e0b8cac1a69 (diff) | |
| download | emacs-4b298d5a3e0d5fb75f66c48598e80122669cef8b.tar.gz emacs-4b298d5a3e0d5fb75f66c48598e80122669cef8b.zip | |
* keyboard.c (record_asynch_buffer_change): Initialize an event
only if it's really needed.
* frame.h (enum output_method): Remove output_mac member since
it's a leftover from the deleted code.
* frame.c (Fframep): Adjust user here ...
* terminal.c (Fterminal_live_p): ... and here.
* coding.c (Qmac): Now here because it's only used to denote
end-of-line encoding type.
(syms_of_coding): DEFSYM it.
* frame.h (Qmac): Remove duplicated declaration.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c index e42461f52a0..2c1139ec5fc 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -301,7 +301,7 @@ Lisp_Object Vcoding_system_hash_table; | |||
| 301 | 301 | ||
| 302 | static Lisp_Object Qcoding_system, Qeol_type; | 302 | static Lisp_Object Qcoding_system, Qeol_type; |
| 303 | static Lisp_Object Qcoding_aliases; | 303 | static Lisp_Object Qcoding_aliases; |
| 304 | Lisp_Object Qunix, Qdos; | 304 | Lisp_Object Qunix, Qdos, Qmac; |
| 305 | Lisp_Object Qbuffer_file_coding_system; | 305 | Lisp_Object Qbuffer_file_coding_system; |
| 306 | static Lisp_Object Qpost_read_conversion, Qpre_write_conversion; | 306 | static Lisp_Object Qpost_read_conversion, Qpre_write_conversion; |
| 307 | static Lisp_Object Qdefault_char; | 307 | static Lisp_Object Qdefault_char; |
| @@ -10303,6 +10303,7 @@ syms_of_coding (void) | |||
| 10303 | DEFSYM (Qeol_type, "eol-type"); | 10303 | DEFSYM (Qeol_type, "eol-type"); |
| 10304 | DEFSYM (Qunix, "unix"); | 10304 | DEFSYM (Qunix, "unix"); |
| 10305 | DEFSYM (Qdos, "dos"); | 10305 | DEFSYM (Qdos, "dos"); |
| 10306 | DEFSYM (Qmac, "mac"); | ||
| 10306 | 10307 | ||
| 10307 | DEFSYM (Qbuffer_file_coding_system, "buffer-file-coding-system"); | 10308 | DEFSYM (Qbuffer_file_coding_system, "buffer-file-coding-system"); |
| 10308 | DEFSYM (Qpost_read_conversion, "post-read-conversion"); | 10309 | DEFSYM (Qpost_read_conversion, "post-read-conversion"); |