procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefer CONSP etc. to XTYPE

Browse source 
* src/nsmenu.m (process_dialog:):
(initFromContents:isQuestion:):
Prefer CONSP (x) to XTYPE (x) == Lisp_Cons,
and similarly for STRINGP (x).
This commit is contained in:
Paul Eggert 2018-08-25 14:20:02 -07:00
parent ccdb08ef4e
commit 2daf8b7e55
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/nsmenu.m
View file

@ -1632,24 +1632,24 @@ - (void)process_dialog: (Lisp_Object) list
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);
if (XTYPE (item) == Lisp_Cons)
if (CONSP (item))
++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);
if (XTYPE (item) == Lisp_String)
if (STRINGP (item))
{
[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++];
@ -1726,7 +1726,7 @@ - (instancetype)initFromContents: (Lisp_Object)contents isQuestion: (BOOL)isQ
Lisp_Object head;
[super init];
if (XTYPE (contents) == Lisp_Cons)
if (CONSP (contents))
{
head = Fcar (contents);
[self process_dialog: Fcdr (contents)];
@ -1734,7 +1734,7 @@ - (instancetype)initFromContents: (Lisp_Object)contents isQuestion: (BOOL)isQ
else
head = contents;
if (XTYPE (head) == Lisp_String)
if (STRINGP (head))
[title setStringValue:
[NSString stringWithUTF8String: SSDATA (head)]];
else if (isQ == YES)