Mercurial > emacs

comparison src/fns.c @ 90072:cb67264d6096

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-2 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-83 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-84 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-3 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-4 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-5 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-6 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-11 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-12 Remove "-face" suffix from lazy-highlight face name * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-13 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-16 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-17 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-18 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-21 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-22 <no summary provided> * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-23 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-39 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-40 Fix regressions from latest reftex update * miles@gnu.org--gnu-2005/gnus--rel--5.10--base-0 tag of miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-1 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-2 Merge from miles@gnu.org--gnu-2004 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-3 Merge from emacs--cvs-trunk--0
author Miles Bader <miles@gnu.org>
date Sun, 16 Jan 2005 03:40:12 +0000
parents 95879cc1ed20 dc3b1db0bed2
children 6d92d69fae33
comparison
equal deleted inserted replaced
90071:f6b4d0ebf147 90072:cb67264d6096
2904 register Lisp_Object tem; 2904 register Lisp_Object tem;
2905 struct gcpro gcpro1, gcpro2; 2905 struct gcpro gcpro1, gcpro2;
2906 2906
2907 CHECK_SYMBOL (feature); 2907 CHECK_SYMBOL (feature);
2908 2908
2909 /* Record the presence of `require' in this file
2910 even if the feature specified is already loaded. */
2911 LOADHIST_ATTACH (Fcons (Qrequire, feature));
2912
2909 tem = Fmemq (feature, Vfeatures); 2913 tem = Fmemq (feature, Vfeatures);
2910 2914
2911 if (NILP (tem)) 2915 if (NILP (tem))
2912 { 2916 {
2913 int count = SPECPDL_INDEX (); 2917 int count = SPECPDL_INDEX ();
2914 int nesting = 0; 2918 int nesting = 0;
2915
2916 LOADHIST_ATTACH (Fcons (Qrequire, feature));
2917 2919
2918 /* This is to make sure that loadup.el gives a clear picture 2920 /* This is to make sure that loadup.el gives a clear picture
2919 of what files are preloaded and when. */ 2921 of what files are preloaded and when. */
2920 if (! NILP (Vpurify_flag)) 2922 if (! NILP (Vpurify_flag))
2921 error ("(require %s) while preparing to dump", 2923 error ("(require %s) while preparing to dump",