comparison src/fns.c @ 167:85ec50267440 r20-3b10

Import from CVS: tag r20-3b10
author cvs
date Mon, 13 Aug 2007 09:45:46 +0200
parents 5a88923fcbfe
children 15872534500d
comparison
equal deleted inserted replaced
166:7a77eb660975 167:85ec50267440
3343 { 3343 {
3344 CHECK_SYMBOL (feature); 3344 CHECK_SYMBOL (feature);
3345 return NILP (Fmemq (feature, Vfeatures)) ? Qnil : Qt; 3345 return NILP (Fmemq (feature, Vfeatures)) ? Qnil : Qt;
3346 } 3346 }
3347 #else 3347 #else
3348 extern int emacs_major_version, emacs_minor_version; 3348 extern Lisp_Object Vemacs_major_version, Vemacs_minor_version;
3349 3349
3350 DEFUN ("featurep", Ffeaturep, 1, 1, 0, /* 3350 DEFUN ("featurep", Ffeaturep, 1, 1, 0, /*
3351 Return non-nil if feature expression FEXP is true. 3351 Return non-nil if feature expression FEXP is true.
3352 */ 3352 */
3353 (fexp)) 3353 (fexp))
3364 { 3364 {
3365 double d = extract_float(fexp); 3365 double d = extract_float(fexp);
3366 3366
3367 if (featurep_emacs_version == 0.0) 3367 if (featurep_emacs_version == 0.0)
3368 { 3368 {
3369 featurep_emacs_version = emacs_major_version + 3369 featurep_emacs_version = XINT (Vemacs_major_version) +
3370 (emacs_minor_version / 100.0); 3370 (XINT (Vemacs_minor_version) / 100.0);
3371 } 3371 }
3372 return (featurep_emacs_version >= d) ? Qt : Qnil; 3372 return (featurep_emacs_version >= d) ? Qt : Qnil;
3373 } 3373 }
3374 else if (CONSP(fexp)) 3374 else if (CONSP(fexp))
3375 { 3375 {
3415 else 3415 else
3416 { 3416 {
3417 return Fsignal(Qinvalid_read_syntax, list1 (fexp)); 3417 return Fsignal(Qinvalid_read_syntax, list1 (fexp));
3418 } 3418 }
3419 } 3419 }
3420 #endif 3420 #endif /* FEATUREP_SYNTAX */
3421 3421
3422 DEFUN ("provide", Fprovide, 1, 1, 0, /* 3422 DEFUN ("provide", Fprovide, 1, 1, 0, /*
3423 Announce that FEATURE is a feature of the current Emacs. 3423 Announce that FEATURE is a feature of the current Emacs.
3424 This function updates the value of the variable `features'. 3424 This function updates the value of the variable `features'.
3425 */ 3425 */