Mercurial > emacs
diff src/lread.c @ 485:8c615e453683
*** empty log message ***
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Mon, 13 Jan 1992 21:48:08 +0000 |
parents | ffdbf3445088 |
children | 63a8e7b3c547 |
line wrap: on
line diff
--- a/src/lread.c Mon Jan 13 21:48:03 1992 +0000 +++ b/src/lread.c Mon Jan 13 21:48:08 1992 +0000 @@ -122,7 +122,7 @@ tem = call0 (readcharfun); - if (NULL (tem)) + if (NILP (tem)) return -1; return XINT (tem); } @@ -250,13 +250,13 @@ since it would try to load a directory as a Lisp file */ if (XSTRING (str)->size > 0) { - fd = openp (Vload_path, str, !NULL (nosuffix) ? "" : ".elc:.el:", + fd = openp (Vload_path, str, !NILP (nosuffix) ? "" : ".elc:.el:", &found, 0); } if (fd < 0) { - if (NULL (noerror)) + if (NILP (noerror)) while (1) Fsignal (Qfile_error, Fcons (build_string ("Cannot open load file"), Fcons (str, Qnil))); @@ -286,7 +286,7 @@ error ("Failure to create stdio stream for %s", XSTRING (str)->data); } - if (NULL (nomessage)) + if (NILP (nomessage)) message ("Loading %s...", XSTRING (str)->data); GCPRO1 (str); @@ -303,11 +303,11 @@ /* Run any load-hooks for this file. */ temp = Fassoc (str, Vafter_load_alist); - if (!NULL (temp)) + if (!NILP (temp)) Fprogn (Fcdr (temp)); UNGCPRO; - if (!noninteractive && NULL (nomessage)) + if (!noninteractive && NILP (nomessage)) message ("Loading %s...done", XSTRING (str)->data); return Qt; } @@ -373,7 +373,7 @@ if (complete_filename_p (str)) absolute = 1; - for (; !NULL (path); path = Fcdr (path)) + for (; !NILP (path); path = Fcdr (path)) { char *nsuffix; @@ -472,7 +472,7 @@ if (c < 0) break; if (c == ' ' || c == '\t' || c == '\n' || c == '\f') continue; - if (!NULL (Vpurify_flag) && c == '(') + if (!NILP (Vpurify_flag) && c == '(') { record_unwind_protect (unreadpure, Qnil); val = read_list (-1, readcharfun); @@ -513,14 +513,14 @@ int count = specpdl_ptr - specpdl; Lisp_Object tem; - if (NULL (printflag)) + if (NILP (printflag)) tem = Qsymbolp; else tem = printflag; specbind (Qstandard_output, tem); record_unwind_protect (save_excursion_restore, save_excursion_save ()); SET_PT (BEGV); - readevalloop (Fcurrent_buffer (), 0, Feval, !NULL (printflag)); + readevalloop (Fcurrent_buffer (), 0, Feval, !NILP (printflag)); return unbind_to (count, Qnil); } @@ -540,20 +540,20 @@ int count = specpdl_ptr - specpdl; Lisp_Object tem; - if (NULL (printflag)) + if (NILP (printflag)) tem = Qsymbolp; else tem = printflag; specbind (Qstandard_output, tem); - if (NULL (printflag)) + if (NILP (printflag)) record_unwind_protect (save_excursion_restore, save_excursion_save ()); record_unwind_protect (save_restriction_restore, save_restriction_save ()); /* This both uses b and checks its type. */ Fgoto_char (b); Fnarrow_to_region (make_number (BEGV), e); - readevalloop (Fcurrent_buffer (), 0, Feval, !NULL (printflag)); + readevalloop (Fcurrent_buffer (), 0, Feval, !NILP (printflag)); return unbind_to (count, Qnil); } @@ -575,7 +575,7 @@ { extern Lisp_Object Fread_minibuffer (); - if (NULL (readcharfun)) + if (NILP (readcharfun)) readcharfun = Vstandard_input; if (EQ (readcharfun, Qt)) readcharfun = Qread_char; @@ -604,7 +604,7 @@ CHECK_STRING (string,0); - if (NULL (end)) + if (NILP (end)) endval = XSTRING (string)->size; else { CHECK_NUMBER (end,2); @@ -613,7 +613,7 @@ args_out_of_range (string, end); } - if (NULL (start)) + if (NILP (start)) startval = 0; else { CHECK_NUMBER (start,1); @@ -659,7 +659,7 @@ switch (c) { case 'a': - return '\a'; + return '\007'; case 'b': return '\b'; case 'e': @@ -859,7 +859,7 @@ /* If purifying, and string starts with \ newline, return zero instead. This is for doc strings that we are really going to find in share-lib/DOC.nn.nn */ - if (!NULL (Vpurify_flag) && NULL (Vdoc_file_name) && cancel) + if (!NILP (Vpurify_flag) && NILP (Vdoc_file_name) && cancel) return make_number (0); if (read_pure) @@ -1060,7 +1060,7 @@ if (XINT (elt) == '.') { GCPRO2 (val, tail); - if (!NULL (tail)) + if (!NILP (tail)) XCONS (tail)->cdr = read0 (readcharfun); else val = read0 (readcharfun); @@ -1075,7 +1075,7 @@ tem = (read_pure && flag <= 0 ? pure_cons (elt, Qnil) : Fcons (elt, Qnil)); - if (!NULL (tail)) + if (!NILP (tail)) XCONS (tail)->cdr = tem; else val = tem; @@ -1120,7 +1120,7 @@ tem = oblookup (obarray, str, len); if (XTYPE (tem) == Lisp_Symbol) return tem; - return Fintern ((!NULL (Vpurify_flag) + return Fintern ((!NILP (Vpurify_flag) ? make_pure_string (str, len) : make_string (str, len)), obarray); @@ -1136,7 +1136,7 @@ { register Lisp_Object tem, sym, *ptr; - if (NULL (obarray)) obarray = Vobarray; + if (NILP (obarray)) obarray = Vobarray; obarray = check_obarray (obarray); CHECK_STRING (str, 0); @@ -1145,7 +1145,7 @@ if (XTYPE (tem) != Lisp_Int) return tem; - if (!NULL (Vpurify_flag)) + if (!NILP (Vpurify_flag)) str = Fpurecopy (str); sym = Fmake_symbol (str); @@ -1167,7 +1167,7 @@ { register Lisp_Object tem; - if (NULL (obarray)) obarray = Vobarray; + if (NILP (obarray)) obarray = Vobarray; obarray = check_obarray (obarray); CHECK_STRING (str, 0); @@ -1270,7 +1270,7 @@ { Lisp_Object tem; - if (NULL (obarray)) obarray = Vobarray; + if (NILP (obarray)) obarray = Vobarray; obarray = check_obarray (obarray); map_obarray (obarray, mapatoms_1, function); @@ -1452,11 +1452,11 @@ } /* Warn if dirs in the *standard* path don't exist. */ - for (; !NULL (normal_path); normal_path = XCONS (normal_path)->cdr) + for (; !NILP (normal_path); normal_path = XCONS (normal_path)->cdr) { Lisp_Object dirfile; dirfile = Fcar (normal_path); - if (!NULL (dirfile)) + if (!NILP (dirfile)) { dirfile = Fdirectory_file_name (dirfile); if (access (XSTRING (dirfile)->data, 0) < 0) @@ -1468,7 +1468,7 @@ if (egetenv ("EMACSLOADPATH")) Vload_path = decode_env_path ("EMACSLOADPATH", normal); #ifndef CANNOT_DUMP - if (!NULL (Vpurify_flag)) + if (!NILP (Vpurify_flag)) Vload_path = Fcons (build_string ("../lisp"), Vload_path); #endif