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

[Richard M . Stallman]

Index: emacs/src/fns.c
diff -c emacs/src/fns.c:1.382 emacs/src/fns.c:1.383
*** emacs/src/fns.c:1.382       Wed Jan 19 00:08:30 2005
--- emacs/src/fns.c     Sun Apr 10 00:28:00 2005
***************
*** 66,71 ****
--- 66,72 ----
  extern int minibuffer_auto_raise;
  extern Lisp_Object minibuf_window;
  extern Lisp_Object Vlocale_coding_system;
+ extern Lisp_Object Vloads_in_progress;
  
  Lisp_Object Qstring_lessp, Qprovide, Qrequire;
  Lisp_Object Qyes_or_no_p_history;
***************
*** 3444,3452 ****
    CHECK_SYMBOL (feature);
  
    /* Record the presence of `require' in this file
!      even if the feature specified is already loaded.  */
!   LOADHIST_ATTACH (Fcons (Qrequire, feature));
! 
    tem = Fmemq (feature, Vfeatures);
  
    if (NILP (tem))
--- 3445,3459 ----
    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 (! NILP (Vloads_in_progress))
!     {
!       tem = Fcons (Qrequire, feature);
!       if (NILP (Fmember (tem, Vcurrent_load_list)))
!       LOADHIST_ATTACH (tem);
!     }
    tem = Fmemq (feature, Vfeatures);
  
    if (NILP (tem))