diff options
| author | Jan D | 2015-04-03 12:32:13 +0200 |
|---|---|---|
| committer | Jan D | 2015-04-03 12:32:13 +0200 |
| commit | 75c8741afba2321add3ad52c5143b4fdb1d63e18 (patch) | |
| tree | 3a125791aba92eb58bee81163a93c3246f275a54 /src/bytecode.c | |
| parent | 734900695acbe17bc7c52c85133918b8949fd2d3 (diff) | |
| parent | 0b914bada39e4577cd9e9209a15c44cc1f83294d (diff) | |
| download | emacs-75c8741afba2321add3ad52c5143b4fdb1d63e18.tar.gz emacs-75c8741afba2321add3ad52c5143b4fdb1d63e18.zip | |
Merge branch 'master' into cairo
Diffstat (limited to 'src/bytecode.c')
| -rw-r--r-- | src/bytecode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index b4583676835..55789b41ad9 100644 --- a/src/bytecode.c +++ b/src/bytecode.c | |||
| @@ -1945,10 +1945,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth, | |||
| 1945 | /* Actually this is Bstack_ref with offset 0, but we use Bdup | 1945 | /* Actually this is Bstack_ref with offset 0, but we use Bdup |
| 1946 | for that instead. */ | 1946 | for that instead. */ |
| 1947 | /* CASE (Bstack_ref): */ | 1947 | /* CASE (Bstack_ref): */ |
| 1948 | call3 (intern ("error"), | 1948 | call3 (Qerror, |
| 1949 | build_string ("Invalid byte opcode: op=%s, ptr=%d"), | 1949 | build_string ("Invalid byte opcode: op=%s, ptr=%d"), |
| 1950 | make_number (op), | 1950 | make_number (op), |
| 1951 | make_number ((stack.pc - 1) - stack.byte_string_start)); | 1951 | make_number ((stack.pc - 1) - stack.byte_string_start)); |
| 1952 | 1952 | ||
| 1953 | /* Handy byte-codes for lexical binding. */ | 1953 | /* Handy byte-codes for lexical binding. */ |
| 1954 | CASE (Bstack_ref1): | 1954 | CASE (Bstack_ref1): |