HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace XTYPE calls in nextstep files
[bpt/emacs.git]
/
src
/
nsmenu.m
diff --git
a/src/nsmenu.m
b/src/nsmenu.m
index
24c1189
..
b6eb21d
100644
(file)
--- a/
src/nsmenu.m
+++ b/
src/nsmenu.m
@@
-1618,24
+1618,24
@@
ns_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
int row = 0;
int buttons = 0, btnnr = 0;
int row = 0;
int buttons = 0, btnnr = 0;
- for (;
XTYPE (lst) == Lisp_Cons
; lst = XCDR (lst))
+ for (;
CONSP (lst)
; lst = XCDR (lst))
{
item = XCAR (list);
{
item = XCAR (list);
- if (
XTYPE (item) == Lisp_Cons
)
+ if (
CONSP (item)
)
++buttons;
}
if (buttons > 0)
button_values = xmalloc (buttons * sizeof *button_values);
++buttons;
}
if (buttons > 0)
button_values = xmalloc (buttons * sizeof *button_values);
- for (;
XTYPE (list) == Lisp_Cons
; list = XCDR (list))
+ for (;
CONSP (list)
; list = XCDR (list))
{
item = XCAR (list);
{
item = XCAR (list);
- if (
XTYPE (item) == Lisp_String
)
+ if (
STRINGP (item)
)
{
[self addString: SSDATA (item) row: row++];
}
{
[self addString: SSDATA (item) row: row++];
}
- else if (
XTYPE (item) == Lisp_Cons
)
+ else if (
CONSP (item)
)
{
button_values[btnnr] = XCDR (item);
[self addButton: SSDATA (XCAR (item)) value: btnnr row: row++];
{
button_values[btnnr] = XCDR (item);
[self addButton: SSDATA (XCAR (item)) value: btnnr row: row++];
@@
-1712,7
+1712,7
@@
ns_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
Lisp_Object head;
[super init];
Lisp_Object head;
[super init];
- if (
XTYPE (contents) == Lisp_Cons
)
+ if (
CONSP (contents)
)
{
head = Fcar (contents);
[self process_dialog: Fcdr (contents)];
{
head = Fcar (contents);
[self process_dialog: Fcdr (contents)];
@@
-1720,7
+1720,7
@@
ns_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
else
head = contents;
else
head = contents;
- if (
XTYPE (head) == Lisp_String
)
+ if (
STRINGP (head)
)
[title setStringValue:
[NSString stringWithUTF8String: SSDATA (head)]];
else if (isQ == YES)
[title setStringValue:
[NSString stringWithUTF8String: SSDATA (head)]];
else if (isQ == YES)