diff options
| author | Dmitry Antipov | 2012-08-01 11:57:09 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-08-01 11:57:09 +0400 |
| commit | 8271d59040b3d83fb3fc8cb23723538183b12ad4 (patch) | |
| tree | 909df79d98251334a8e2dc393d54ec47cc441756 /src/cmds.c | |
| parent | 0d26d7c4dc79554439ad96fb7d9f75aa2085e0ca (diff) | |
| download | emacs-8271d59040b3d83fb3fc8cb23723538183b12ad4.tar.gz emacs-8271d59040b3d83fb3fc8cb23723538183b12ad4.zip | |
Use INTERNAL_FIELD for symbols.
* src/lisp.h (SVAR): New macro. Adjust users.
* src/alloc.c, src/bytecode.c, src/cmds.c, src/data.c, src/doc.c, src/eval.c:
* src/fns.c, src/keyboard.c, src/lread.c, src/xterm.c: Users changed.
* admin/coccinelle/symbol.cocci: Semantic patch to replace direct
access to Lisp_Object members of struct Lisp_Symbol to SVAR.
Diffstat (limited to 'src/cmds.c')
| -rw-r--r-- | src/cmds.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/cmds.c b/src/cmds.c index a7a2eb6f528..4512f562064 100644 --- a/src/cmds.c +++ b/src/cmds.c | |||
| @@ -446,11 +446,13 @@ internal_self_insert (int c, EMACS_INT n) | |||
| 446 | /* If we expanded an abbrev which has a hook, | 446 | /* If we expanded an abbrev which has a hook, |
| 447 | and the hook has a non-nil `no-self-insert' property, | 447 | and the hook has a non-nil `no-self-insert' property, |
| 448 | return right away--don't really self-insert. */ | 448 | return right away--don't really self-insert. */ |
| 449 | if (SYMBOLP (sym) && ! NILP (sym) && ! NILP (XSYMBOL (sym)->function) | 449 | if (SYMBOLP (sym) && ! NILP (sym) |
| 450 | && SYMBOLP (XSYMBOL (sym)->function)) | 450 | && ! NILP (SVAR (XSYMBOL (sym), function)) |
| 451 | && SYMBOLP (SVAR (XSYMBOL (sym), function))) | ||
| 451 | { | 452 | { |
| 452 | Lisp_Object prop; | 453 | Lisp_Object prop; |
| 453 | prop = Fget (XSYMBOL (sym)->function, intern ("no-self-insert")); | 454 | prop = Fget (SVAR (XSYMBOL (sym), function), |
| 455 | intern ("no-self-insert")); | ||
| 454 | if (! NILP (prop)) | 456 | if (! NILP (prop)) |
| 455 | return 1; | 457 | return 1; |
| 456 | } | 458 | } |