diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-08-07 17:37:21 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-08-07 17:37:21 +0400 |
| commit | c644523bd8a23e518c91b61a1b8520e866b715b9 (patch) | |
| tree | 60fae47e02ad6c87b5e657110606255e849ecf77 /src/cmds.c | |
| parent | 6a3d20cc46da1e59f230923056b6b351acb097b9 (diff) | |
| download | emacs-c644523bd8a23e518c91b61a1b8520e866b715b9.tar.gz | |
Revert and cleanup Lisp_Cons, Lisp_Misc and Lisp_Symbol things.
* src/lisp.h (struct Lisp_Symbol): Change xname to meaningful
name since all xname users are fixed long time ago. Do not use
INTERNAL_FIELD.
(set_symbol_name, set_symbol_function, set_symbol_plist):
(set_symbol_next, set_overlay_plist): New function.
(struct Lisp_Cons): Do not use INTERNAL_FIELD.
(struct Lisp_Overlay): Likewise.
(CVAR, MVAR, SVAR): Remove.
* src/alloc.c, src/buffer.c, src/buffer.h, 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/nsselect.m, src/xterm.c:
Adjust users.
* src/.gdbinit: Change to use name field of struct Lisp_Symbol
where appropriate.
* admin/coccinelle/overlay.cocci, admin/coccinelle/symbol.cocci:
Remove.
Diffstat (limited to 'src/cmds.c')
| -rw-r--r-- | src/cmds.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/cmds.c b/src/cmds.c index 4512f562064..c06a9edd160 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -447,12 +447,11 @@ internal_self_insert (int c, EMACS_INT n) and the hook has a non-nil `no-self-insert' property, return right away--don't really self-insert. */ if (SYMBOLP (sym) && ! NILP (sym) - && ! NILP (SVAR (XSYMBOL (sym), function)) - && SYMBOLP (SVAR (XSYMBOL (sym), function))) + && ! NILP (XSYMBOL (sym)->function) + && SYMBOLP (XSYMBOL (sym)->function)) { Lisp_Object prop; - prop = Fget (SVAR (XSYMBOL (sym), function), - intern ("no-self-insert")); + prop = Fget (XSYMBOL (sym)->function, intern ("no-self-insert")); if (! NILP (prop)) return 1; } |