[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] test-concurrency 137898d 4/8: Fix a typo in bytecode.c.
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] test-concurrency 137898d 4/8: Fix a typo in bytecode.c. |
Date: |
Thu, 8 Dec 2016 17:13:48 +0000 (UTC) |
branch: test-concurrency
commit 137898d89359c63ec05d7bb5eedc2d2f59102a11
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix a typo in bytecode.c.
---
src/bytecode.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/bytecode.c b/src/bytecode.c
index 7d5f85d..6439268 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -656,7 +656,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector,
Lisp_Object maxdepth,
if (SYMBOLP (sym)
&& !EQ (val, Qunbound)
&& !XSYMBOL (sym)->redirect
- && !SYMBOL_TRAPPED_WRITE_P (sym))
+ && !SYMBOL_TRAPPED_WRITE_P (sym))
SET_SYMBOL_VAL (XSYMBOL (sym), val);
else
set_internal (sym, val, Qnil, SET_INTERNAL_SET);
@@ -754,7 +754,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector,
Lisp_Object maxdepth,
CASE (Bgoto):
BYTE_CODE_QUIT;
- op = FETCH2; /* pc = FETCH2 loses since FETCH2 contains pc++ */
+ op = FETCH2; /* pc = FETCH2 loses since FETCH2 contains pc++ */
CHECK_RANGE (op);
stack.pc = stack.byte_string_start + op;
NEXT;
@@ -778,6 +778,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector,
Lisp_Object maxdepth,
CHECK_RANGE (op);
stack.pc = stack.byte_string_start + op;
}
+ else DISCARD (1);
NEXT;
CASE (Bgotoifnonnilelsepop):
- [Emacs-diffs] branch test-concurrency created (now 128cacd), Eli Zaretskii, 2016/12/08
- [Emacs-diffs] test-concurrency e4deba0 2/8: Fix merged code in process.c and eval.c., Eli Zaretskii, 2016/12/08
- [Emacs-diffs] test-concurrency 128cacd 8/8: Add a NEWS entry., Eli Zaretskii, 2016/12/08
- [Emacs-diffs] test-concurrency 66a5abb 3/8: Fix compilation problems., Eli Zaretskii, 2016/12/08
- [Emacs-diffs] test-concurrency 16ac7c0 6/8: Minimize spurious diffs from master., Eli Zaretskii, 2016/12/08
- [Emacs-diffs] test-concurrency fa7d1f0 7/8: Fix network streams., Eli Zaretskii, 2016/12/08
- [Emacs-diffs] test-concurrency 8ad9241 5/8: Fix the test suite, Eli Zaretskii, 2016/12/08
- [Emacs-diffs] test-concurrency 137898d 4/8: Fix a typo in bytecode.c.,
Eli Zaretskii <=
- [Emacs-diffs] test-concurrency de4624c 1/8: Merge branch 'concurrency', Eli Zaretskii, 2016/12/08