emacs-pretest-bug
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Should eval of `require' cause a `require' entry in `load-history'?


From: Richard M. Stallman
Subject: Re: Should eval of `require' cause a `require' entry in `load-history'?
Date: Sun, 04 Dec 2005 16:19:44 -0500

            IIUC, for a `require' entry to be added to `load-history', the file
            containing it must be _loaded_, via `load', `load-file',
            `load-library', or `require' - it is not enough to evaluate a
            `require' expression for it to be added as an entry for the file in
            which it is contained.

What results do you get with this change?

*** fns.c       20 Oct 2005 12:56:27 -0400      1.404
--- fns.c       04 Dec 2005 15:42:48 -0500      
***************
*** 3559,3564 ****
--- 3559,3565 ----
  {
    register Lisp_Object tem;
    struct gcpro gcpro1, gcpro2;
+   int from_file = load_in_progress;
  
    CHECK_SYMBOL (feature);
  
***************
*** 3566,3572 ****
       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)))
--- 3567,3578 ----
       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 (!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)))




reply via email to

[Prev in Thread] Current Thread [Next in Thread]