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
emacs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
fbb90829
Commit
fbb90829
authored
Jul 17, 1995
by
Karl Heuer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(current_minor_maps): Catch errors in Findirect_function.
(current_minor_maps_error): New function.
parent
ee8e09af
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
3 deletions
+20
-3
src/keymap.c
src/keymap.c
+20
-3
No files found.
src/keymap.c
View file @
fbb90829
...
...
@@ -799,6 +799,13 @@ append_key (key_sequence, key)
static
Lisp_Object
*
cmm_modes
,
*
cmm_maps
;
static
int
cmm_size
;
/* Error handler used in current_minor_maps. */
static
Lisp_Object
current_minor_maps_error
()
{
return
Qnil
;
}
/* Store a pointer to an array of the keymaps of the currently active
minor modes in *buf, and return the number of maps it contains.
...
...
@@ -830,6 +837,8 @@ current_minor_maps (modeptr, mapptr)
&&
(
val
=
find_symbol_value
(
var
),
!
EQ
(
val
,
Qunbound
))
&&
!
NILP
(
val
))
{
Lisp_Object
temp
;
if
(
i
>=
cmm_size
)
{
Lisp_Object
*
newmodes
,
*
newmaps
;
...
...
@@ -865,9 +874,17 @@ current_minor_maps (modeptr, mapptr)
else
break
;
}
cmm_modes
[
i
]
=
var
;
cmm_maps
[
i
]
=
Findirect_function
(
XCONS
(
assoc
)
->
cdr
);
i
++
;
/* Get the keymap definition--or nil if it is not defined. */
temp
=
internal_condition_case_1
(
Findirect_function
,
XCONS
(
assoc
)
->
cdr
,
Qerror
,
current_minor_maps_error
);
if
(
!
NILP
(
temp
))
{
cmm_modes
[
i
]
=
var
;
cmm_maps
[
i
]
=
temp
;
i
++
;
}
}
if
(
modeptr
)
*
modeptr
=
cmm_modes
;
...
...
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