Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
93d2aa1c
Commit
93d2aa1c
authored
May 29, 2000
by
Dave Love
Browse files
Include intervals.h.
(Fkey_binding, Fwhere_is_internal): Deal with `keymap' property.
parent
8c45fa0a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
3 deletions
+23
-3
src/keymap.c
src/keymap.c
+23
-3
No files found.
src/keymap.c
View file @
93d2aa1c
...
...
@@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA. */
#include "termhooks.h"
#include "blockinput.h"
#include "puresize.h"
#include "intervals.h"
#define min(a, b) ((a) < (b) ? (a) : (b))
...
...
@@ -1285,7 +1286,15 @@ recognize the default bindings, just as `read-key-sequence' does.")
RETURN_UNGCPRO
(
value
);
}
local
=
get_local_map
(
PT
,
current_buffer
);
local
=
get_local_map
(
PT
,
current_buffer
,
keymap
);
if
(
!
NILP
(
local
))
{
value
=
Flookup_key
(
local
,
key
,
accept_default
);
if
(
!
NILP
(
value
)
&&
!
INTEGERP
(
value
))
RETURN_UNGCPRO
(
value
);
}
local
=
get_local_map
(
PT
,
current_buffer
,
local_map
);
if
(
!
NILP
(
local
))
{
...
...
@@ -2068,14 +2077,25 @@ indirect definition itself.")
shadowed bindings. */
keymap1
=
keymap
;
if
(
!
keymap_specified
)
keymap1
=
get_local_map
(
PT
,
current_buffer
);
keymap1
=
get_local_map
(
PT
,
current_buffer
,
keymap
);
if
(
!
NILP
(
keymap1
))
maps
=
nconc2
(
Faccessible_keymaps
(
get_keymap
(
keymap1
),
Qnil
),
Faccessible_keymaps
(
get_keymap
(
current_global_map
),
Qnil
));
else
maps
=
Faccessible_keymaps
(
get_keymap
(
current_global_map
),
Qnil
);
{
keymap1
=
keymap
;
if
(
!
keymap_specified
)
keymap1
=
get_local_map
(
PT
,
current_buffer
,
local_map
);
if
(
!
NILP
(
keymap1
))
maps
=
nconc2
(
Faccessible_keymaps
(
get_keymap
(
keymap1
),
Qnil
),
Faccessible_keymaps
(
get_keymap
(
current_global_map
),
Qnil
));
else
maps
=
Faccessible_keymaps
(
get_keymap
(
current_global_map
),
Qnil
);
}
/* Put the minor mode keymaps on the front. */
if
(
!
keymap_specified
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment