/[emacs]/emacs/src/fns.c
ViewVC logotype

Diff of /emacs/src/fns.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.382 by kfstorm, Wed Jan 19 00:08:30 2005 UTC revision 1.383 by rms, Sun Apr 10 00:28:00 2005 UTC
# Line 66  int use_file_dialog; Line 66  int use_file_dialog;
66  extern int minibuffer_auto_raise;  extern int minibuffer_auto_raise;
67  extern Lisp_Object minibuf_window;  extern Lisp_Object minibuf_window;
68  extern Lisp_Object Vlocale_coding_system;  extern Lisp_Object Vlocale_coding_system;
69    extern Lisp_Object Vloads_in_progress;
70    
71  Lisp_Object Qstring_lessp, Qprovide, Qrequire;  Lisp_Object Qstring_lessp, Qprovide, Qrequire;
72  Lisp_Object Qyes_or_no_p_history;  Lisp_Object Qyes_or_no_p_history;
# Line 3444  The normal messages at start and end of Line 3445  The normal messages at start and end of
3445    CHECK_SYMBOL (feature);    CHECK_SYMBOL (feature);
3446    
3447    /* Record the presence of `require' in this file    /* Record the presence of `require' in this file
3448       even if the feature specified is already loaded.  */       even if the feature specified is already loaded.
3449    LOADHIST_ATTACH (Fcons (Qrequire, feature));       But not more than once in any file,
3450         and not when we aren't loading a file.  */
3451      if (! NILP (Vloads_in_progress))
3452        {
3453          tem = Fcons (Qrequire, feature);
3454          if (NILP (Fmember (tem, Vcurrent_load_list)))
3455            LOADHIST_ATTACH (tem);
3456        }
3457    tem = Fmemq (feature, Vfeatures);    tem = Fmemq (feature, Vfeatures);
3458    
3459    if (NILP (tem))    if (NILP (tem))

Legend:
Removed from v.1.382  
changed lines
  Added in v.1.383

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26