[Emacs-diffs] Changes to emacs/src/fns.c

[Richard M . Stallman]

Index: emacs/src/fns.c
diff -c emacs/src/fns.c:1.404 emacs/src/fns.c:1.405
*** emacs/src/fns.c:1.404       Thu Oct 20 15:03:26 2005
--- emacs/src/fns.c     Sun Dec 11 05:10:08 2005
***************
*** 3559,3572 ****
  {
    register Lisp_Object tem;
    struct gcpro gcpro1, gcpro2;
  
    CHECK_SYMBOL (feature);
  
    /* Record the presence of `require' in this file
       even if the feature specified is already loaded.
       But not more than once in any file,
!      and not when we aren't loading a file.  */
!   if (load_in_progress)
      {
        tem = Fcons (Qrequire, feature);
        if (NILP (Fmember (tem, Vcurrent_load_list)))
--- 3559,3578 ----
  {
    register Lisp_Object tem;
    struct gcpro gcpro1, gcpro2;
+   int from_file = load_in_progress;
  
    CHECK_SYMBOL (feature);
  
    /* Record the presence of `require' in this file
       even if the feature specified is already loaded.
       But not more than once in any file,
!      and not when we aren't loading or reading from a file.  */
!   if (!from_file)
!     for (tem = Vcurrent_load_list; CONSP (tem); tem = XCDR (tem))
!       if (NILP (XCDR (tem)) && STRINGP (XCAR (tem)))
!       from_file = 1;
! 
!   if (from_file)
      {
        tem = Fcons (Qrequire, feature);
        if (NILP (Fmember (tem, Vcurrent_load_list)))