aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2013-11-11 22:07:37 -0800
committerPaul Eggert2013-11-11 22:07:37 -0800
commitb3671617075e5d7307255425c292c9f211606cd2 (patch)
tree7f6809e3447f9806cb3c8983365132fff1aea466 /src
parente3ac17b675da71159c536221efe9e0f932e937f2 (diff)
downloademacs-b3671617075e5d7307255425c292c9f211606cd2.tar.gz
emacs-b3671617075e5d7307255425c292c9f211606cd2.zip
* xterm.c (syms_of_xterm): staticpro Qalt, Qhyper, Qmeta, and Qsuper.
This is safer, and it's what w32fns.c does.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xterm.c8
2 files changed, 6 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7ea7fb84ec9..08bbe9e69d2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
12013-11-12 Paul Eggert <eggert@cs.ucla.edu> 12013-11-12 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * xterm.c (syms_of_xterm): staticpro Qmodifier_value. 3 * xterm.c (syms_of_xterm): staticpro Qmodifier_value, Qalt, Qhyper,
4 Qmeta, and Qsuper. This is safer, and it's what w32fns.c does.
4 5
5 * buffer.c (Fforce_mode_line_update): Don't fall off end of function 6 * buffer.c (Fforce_mode_line_update): Don't fall off end of function
6 that requires a return value. 7 that requires a return value.
diff --git a/src/xterm.c b/src/xterm.c
index b803cc13258..446b2cf1e45 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10588,13 +10588,13 @@ With MS Windows or Nextstep, the value is t. */);
10588#endif 10588#endif
10589 10589
10590 DEFSYM (Qmodifier_value, "modifier-value"); 10590 DEFSYM (Qmodifier_value, "modifier-value");
10591 Qalt = intern_c_string ("alt"); 10591 DEFSYM (Qalt, "alt");
10592 Fput (Qalt, Qmodifier_value, make_number (alt_modifier)); 10592 Fput (Qalt, Qmodifier_value, make_number (alt_modifier));
10593 Qhyper = intern_c_string ("hyper"); 10593 DEFSYM (Qhyper, "hyper");
10594 Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier)); 10594 Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier));
10595 Qmeta = intern_c_string ("meta"); 10595 DEFSYM (Qmeta, "meta");
10596 Fput (Qmeta, Qmodifier_value, make_number (meta_modifier)); 10596 Fput (Qmeta, Qmodifier_value, make_number (meta_modifier));
10597 Qsuper = intern_c_string ("super"); 10597 DEFSYM (Qsuper, "super");
10598 Fput (Qsuper, Qmodifier_value, make_number (super_modifier)); 10598 Fput (Qsuper, Qmodifier_value, make_number (super_modifier));
10599 10599
10600 DEFVAR_LISP ("x-alt-keysym", Vx_alt_keysym, 10600 DEFVAR_LISP ("x-alt-keysym", Vx_alt_keysym,