diff options
| author | YAMAMOTO Mitsuharu | 2019-05-23 10:53:23 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2019-05-23 10:53:23 +0900 |
| commit | b40dde705af4d53853de6185a2468153b442dc9a (patch) | |
| tree | e8dabba695163c2d07439fad6accff761f8f714c /src/bytecode.c | |
| parent | 5d7dafacf4afc888511649f6fc24c28210cd0dfc (diff) | |
| parent | 03feb9376b54c489e24478954a11061e9b0d6db7 (diff) | |
| download | emacs-b40dde705af4d53853de6185a2468153b442dc9a.tar.gz emacs-b40dde705af4d53853de6185a2468153b442dc9a.zip | |
Merge branch 'master' into harfbuzz
Diffstat (limited to 'src/bytecode.c')
| -rw-r--r-- | src/bytecode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index 40977799bfc..6f601cf0cd5 100644 --- a/src/bytecode.c +++ b/src/bytecode.c | |||
| @@ -562,7 +562,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth, | |||
| 562 | /* Inline the most common case. */ | 562 | /* Inline the most common case. */ |
| 563 | if (SYMBOLP (sym) | 563 | if (SYMBOLP (sym) |
| 564 | && !EQ (val, Qunbound) | 564 | && !EQ (val, Qunbound) |
| 565 | && !XSYMBOL (sym)->u.s.redirect | 565 | && XSYMBOL (sym)->u.s.redirect == SYMBOL_PLAINVAL |
| 566 | && !SYMBOL_TRAPPED_WRITE_P (sym)) | 566 | && !SYMBOL_TRAPPED_WRITE_P (sym)) |
| 567 | SET_SYMBOL_VAL (XSYMBOL (sym), val); | 567 | SET_SYMBOL_VAL (XSYMBOL (sym), val); |
| 568 | else | 568 | else |