Merge from emacs--devo--0

[gnu-emacs] / src / lread.c

diff --git a/src/lread.c b/src/lread.c
index 6ca7121b363e2e695cf6ab714172b8ca5439180d..fcc344d58756cce5258130f52db96f7c4ca0805d 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -101,7 +101,7 @@ static Lisp_Object Qload_force_doc_strings;
 extern Lisp_Object Qevent_symbol_element_mask;
 extern Lisp_Object Qfile_exists_p;
 
-/* non-zero iff inside `load' */
+/* non-zero if inside `load' */
 int load_in_progress;
 
 /* Directory in which the sources were found.  */
@@ -1324,7 +1324,7 @@ in which case file-name-handlers are ignored.  */)
    On success, returns a file descriptor.  On failure, returns -1.
 
    SUFFIXES is a list of strings containing possible suffixes.
-   The empty suffix is automatically added iff the list is empty.
+   The empty suffix is automatically added if the list is empty.
 
    PREDICATE non-nil means don't open the files,
    just look for one that satisfies the predicate.  In this case,
@@ -4208,7 +4208,7 @@ customize `jka-compr-load-suffixes' rather than the present variable.  */);
   Vload_file_rep_suffixes = Fcons (empty_unibyte_string, Qnil);
 
   DEFVAR_BOOL ("load-in-progress", &load_in_progress,
-              doc: /* Non-nil iff inside of `load'.  */);
+              doc: /* Non-nil if inside of `load'.  */);
 
   DEFVAR_LISP ("after-load-alist", &Vafter_load_alist,
               doc: /* An alist of expressions to be evalled when particular files are loaded.