*** empty log message ***

[bpt/emacs.git] / src / lread.c

diff --git a/src/lread.c b/src/lread.c
index 73d448d..2a8c47e 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -122,7 +122,7 @@ readchar (readcharfun)
 
   tem = call0 (readcharfun);
 
-  if (NULL (tem))
+  if (NILP (tem))
     return -1;
   return XINT (tem);
 }
@@ -250,13 +250,13 @@ Return t if file exists.")
      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 @@ Return t if file exists.")
       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 @@ Return t if file exists.")
 
   /* 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 @@ openp (path, str, suffix, storeptr, exec_only)
   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 @@ readevalloop (readcharfun, stream, evalfun, printflag)
       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 @@ point remains at the end of the last character read from the buffer.")
   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 @@ point remains at the end of the last character read from the buffer.")
   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 @@ STREAM or the value of `standard-input' may be:\n\
 {
   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 @@ START and END optionally delimit a substring of STRING from which to read;\n\
 
   CHECK_STRING (string,0);
 
-  if (NULL (end))
+  if (NILP (end))
     endval = XSTRING (string)->size;
   else
     { CHECK_NUMBER (end,2);
@@ -613,7 +613,7 @@ START and END optionally delimit a substring of STRING from which to read;\n\
        args_out_of_range (string, end);
     }
 
-  if (NULL (start))
+  if (NILP (start))
     startval = 0;
   else
     { CHECK_NUMBER (start,1);
@@ -659,7 +659,7 @@ read_escape (readcharfun)
   switch (c)
     {
     case 'a':
-      return '\a';
+      return '\007';
     case 'b':
       return '\b';
     case 'e':
@@ -859,7 +859,7 @@ read1 (readcharfun)
        /* 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 @@ read_list (flag, readcharfun)
          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 @@ read_list (flag, readcharfun)
       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 @@ intern (str)
   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 @@ it defaults to the value of `obarray'.")
 {
   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 @@ it defaults to the value of `obarray'.")
   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 @@ it defaults to the value of `obarray'.")
 {
   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 @@ OBARRAY defaults to the value of `obarray'.")
 {
   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 @@ init_lread ()
     }
 
   /* 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 @@ init_lread ()
   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