diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2018-08-25 14:20:02 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-08-25 14:20:27 -0700 |
commit | 2daf8b7e55698cc58f9b0a82aac591f957041cc6 (patch) | |
tree | d806c9974de7de06653a0557aeb0c3ace682ea7b /src/nsmenu.m | |
parent | ccdb08ef4ed8f96e79aa06cf5e806c9c487d58ad (diff) | |
download | emacs-2daf8b7e55698cc58f9b0a82aac591f957041cc6.tar.gz |
Prefer CONSP etc. to XTYPE
* src/nsmenu.m (process_dialog:):
(initFromContents:isQuestion:):
Prefer CONSP (x) to XTYPE (x) == Lisp_Cons,
and similarly for STRINGP (x).
Diffstat (limited to 'src/nsmenu.m')
-rw-r--r-- | src/nsmenu.m | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index 7010b773e3c..983e77763b9 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -1632,24 +1632,24 @@ ns_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents) 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 @@ ns_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents) 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 @@ ns_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents) else head = contents; - if (XTYPE (head) == Lisp_String) + if (STRINGP (head)) [title setStringValue: [NSString stringWithUTF8String: SSDATA (head)]]; else if (isQ == YES) |