summaryrefslogtreecommitdiff
path: root/src/macfns.c
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2007-10-16 16:28:39 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2007-10-16 16:28:39 +0000
commit9beb8baa1f1b59f8e76df62e95647c39acbac5e7 (patch)
treed01390c83402aff49ddf14e282a9edb9bc983ba3 /src/macfns.c
parentd3f41ff55563551d241407ef640c9984156f87b8 (diff)
downloademacs-9beb8baa1f1b59f8e76df62e95647c39acbac5e7.tar.gz
* xfns.c (Fx_create_frame, Fx_display_list):
* window.c (window_fixed_size_p, enlarge_window, shrink_window_lowest_first): * macterm.c (init_font_name_table): * macfns.c (Fx_create_frame, Fx_display_list): * lread.c (close_load_descs): * keyboard.c (read_char_x_menu_prompt): * fns.c (Fmember, Fmemql, Fdelete, Fset_char_table_parent): * coding.c (code_convert_region_unwind): Test the type of an object rather than just !NILP before extracting data from it.
Diffstat (limited to 'src/macfns.c')
-rw-r--r--src/macfns.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/macfns.c b/src/macfns.c
index 6a12c071cee..d0b859054a6 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -2826,7 +2826,7 @@ This function is an internal primitive--use `make-frame' instead. */)
/* All remaining specified parameters, which have not been "used"
by x_get_arg and friends, now go in the misc. alist of the frame. */
- for (tem = parameters; !NILP (tem); tem = XCDR (tem))
+ for (tem = parameters; CONSP (tem); tem = XCDR (tem))
if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem))))
f->param_alist = Fcons (XCAR (tem), f->param_alist);
@@ -3402,7 +3402,7 @@ DEFUN ("x-display-list", Fx_display_list, Sx_display_list, 0, 0, 0,
Lisp_Object tail, result;
result = Qnil;
- for (tail = x_display_name_list; ! NILP (tail); tail = XCDR (tail))
+ for (tail = x_display_name_list; CONSP (tail); tail = XCDR (tail))
result = Fcons (XCAR (XCAR (tail)), result);
return result;