branch: externals/pq commit c9df58b1ac33a2d7983b8b426c80ab048414be59 Author: Andreas Seltenreich <seltenre...@gmx.de> Commit: Andreas Seltenreich <seltenre...@gmx.de>
Always look up t and nil instead of caching them. Caching Qnil and Qt across different environments was never legal, and it started to crash with the latest emacs master code. --- pq.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pq.c b/pq.c index 3927da67f5..af967812f5 100644 --- a/pq.c +++ b/pq.c @@ -10,8 +10,8 @@ int plugin_is_GPL_compatible; -static emacs_value Qnil; -static emacs_value Qt; +#define Qnil env->intern(env, "nil") +#define Qt env->intern(env, "t") #define NOTICE_FORMAT "pq: %s" @@ -322,9 +322,6 @@ emacs_module_init (struct emacs_runtime *ert) #undef DEFUN - Qnil = env->intern (env, "nil"); - Qt = env->intern (env, "t"); - provide(env, "pq"); /* loaded successfully */