diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /src/bytecode.c | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/bytecode.c')
| -rw-r--r-- | src/bytecode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index 1d89d02e28f..b4583676835 100644 --- a/src/bytecode.c +++ b/src/bytecode.c | |||
| @@ -69,7 +69,6 @@ by Hallvard: | |||
| 69 | 69 | ||
| 70 | #ifdef BYTE_CODE_METER | 70 | #ifdef BYTE_CODE_METER |
| 71 | 71 | ||
| 72 | Lisp_Object Qbyte_code_meter; | ||
| 73 | #define METER_2(code1, code2) AREF (AREF (Vbyte_code_meter, code1), code2) | 72 | #define METER_2(code1, code2) AREF (AREF (Vbyte_code_meter, code1), code2) |
| 74 | #define METER_1(code) METER_2 (0, code) | 73 | #define METER_1(code) METER_2 (0, code) |
| 75 | 74 | ||