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
3b0512a3
Commit
3b0512a3
authored
Apr 01, 2012
by
Andreas Schwab
Browse files
Fixes: debbugs:11141
* w32menu.c (is_simple_dialog): Properly check lisp types.
parent
d6ec6cb4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
4 deletions
+17
-4
src/ChangeLog
src/ChangeLog
+5
-0
src/w32menu.c
src/w32menu.c
+12
-4
No files found.
src/ChangeLog
View file @
3b0512a3
2012-04-01 Andreas Schwab <schwab@linux-m68k.org>
* w32menu.c (is_simple_dialog): Properly check lisp types.
(Bug#11141)
2012-03-31 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (move_it_by_lines): When DVPOS is positive, and the
...
...
src/w32menu.c
View file @
3b0512a3
...
...
@@ -1173,18 +1173,23 @@ w32_dialog_show (FRAME_PTR f, int keymaps,
static
int
is_simple_dialog
(
Lisp_Object
contents
)
{
Lisp_Object
options
=
XCDR
(
contents
)
;
Lisp_Object
options
;
Lisp_Object
name
,
yes
,
no
,
other
;
if
(
!
CONSP
(
contents
))
return
0
;
options
=
XCDR
(
contents
);
yes
=
build_string
(
"Yes"
);
no
=
build_string
(
"No"
);
if
(
!
CONSP
(
options
))
return
0
;
name
=
XCAR
(
XCAR
(
options
)
)
;
if
(
!
CONSP
(
options
))
name
=
XCAR
(
options
);
if
(
!
CONSP
(
name
))
return
0
;
name
=
XCAR
(
name
);
if
(
!
NILP
(
Fstring_equal
(
name
,
yes
)))
other
=
no
;
...
...
@@ -1197,7 +1202,10 @@ is_simple_dialog (Lisp_Object contents)
if
(
!
CONSP
(
options
))
return
0
;
name
=
XCAR
(
XCAR
(
options
));
name
=
XCAR
(
options
);
if
(
!
CONSP
(
name
))
return
0
;
name
=
XCAR
(
name
);
if
(
NILP
(
Fstring_equal
(
name
,
other
)))
return
0
;
...
...
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