aboutsummaryrefslogtreecommitdiffstats
path: root/src/keymap.c
diff options
context:
space:
mode:
authorJan D2015-05-23 12:28:54 +0200
committerJan D2015-05-23 12:28:54 +0200
commit6aaa489dc112f51f6045f79b37cb78dd513e398f (patch)
treea34eb6ad435ab877848f7464374570549ca55ec5 /src/keymap.c
parentee14727ce033bae3bc11af35e7843604e5a5e635 (diff)
parent7ac84a2570e1268cc040fcd529508307b2b22c01 (diff)
downloademacs-6aaa489dc112f51f6045f79b37cb78dd513e398f.tar.gz
emacs-6aaa489dc112f51f6045f79b37cb78dd513e398f.zip
Merge branch 'master' into cairo
Diffstat (limited to 'src/keymap.c')
-rw-r--r--src/keymap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/keymap.c b/src/keymap.c
index d10c00489d1..e9898051dc7 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -498,7 +498,7 @@ access_keymap_1 (Lisp_Object map, Lisp_Object idx,
498 if (INTEGERP (idx) && (XFASTINT (idx) & CHAR_MODIFIER_MASK) == 0) 498 if (INTEGERP (idx) && (XFASTINT (idx) & CHAR_MODIFIER_MASK) == 0)
499 { 499 {
500 val = Faref (binding, idx); 500 val = Faref (binding, idx);
501 /* `nil' has a special meaning for char-tables, so 501 /* nil has a special meaning for char-tables, so
502 we use something else to record an explicitly 502 we use something else to record an explicitly
503 unbound entry. */ 503 unbound entry. */
504 if (NILP (val)) 504 if (NILP (val))
@@ -849,7 +849,7 @@ store_in_keymap (Lisp_Object keymap, register Lisp_Object idx, Lisp_Object def)
849 if (NATNUMP (idx) && !(XFASTINT (idx) & CHAR_MODIFIER_MASK)) 849 if (NATNUMP (idx) && !(XFASTINT (idx) & CHAR_MODIFIER_MASK))
850 { 850 {
851 Faset (elt, idx, 851 Faset (elt, idx,
852 /* `nil' has a special meaning for char-tables, so 852 /* nil has a special meaning for char-tables, so
853 we use something else to record an explicitly 853 we use something else to record an explicitly
854 unbound entry. */ 854 unbound entry. */
855 NILP (def) ? Qt : def); 855 NILP (def) ? Qt : def);