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

[Lute Kamstra]

Index: emacs/src/fns.c
diff -c emacs/src/fns.c:1.384 emacs/src/fns.c:1.385
*** emacs/src/fns.c:1.384       Sun Apr 10 19:02:24 2005
--- emacs/src/fns.c     Mon Apr 18 10:20:46 2005
***************
*** 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;
--- 66,72 ----
  extern int minibuffer_auto_raise;
  extern Lisp_Object minibuf_window;
  extern Lisp_Object Vlocale_coding_system;
! extern int load_in_progress;
  
  Lisp_Object Qstring_lessp, Qprovide, Qrequire;
  Lisp_Object Qyes_or_no_p_history;
***************
*** 3460,3466 ****
       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)))
--- 3460,3466 ----
       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)))