Mercurial > hg > xemacs-beta

comparison src/lread.c @ 209:41ff10fd062f r20-4b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-4b3
author cvs
date Mon, 13 Aug 2007 10:04:58 +0200
parents e45d5e7c476e
children 434959a2fba3
comparison
equal deleted inserted replaced
208:f427b8ec4379 209:41ff10fd062f
75 75
76 /* This symbol is also used in fns.c */ 76 /* This symbol is also used in fns.c */
77 #define FEATUREP_SYNTAX 77 #define FEATUREP_SYNTAX
78 78
79 #ifdef FEATUREP_SYNTAX 79 #ifdef FEATUREP_SYNTAX
80 static Lisp_Object Qfeaturep; 80 Lisp_Object Qfeaturep;
81 #endif 81 #endif
82 82
83 /* non-zero if inside `load' */ 83 /* non-zero if inside `load' */
84 int load_in_progress; 84 int load_in_progress;
85 85
819 || (XSTRING_LENGTH (pathname) > 2 819 || (XSTRING_LENGTH (pathname) > 2
820 && IS_DEVICE_SEP (s[1]) && IS_DIRECTORY_SEP (s[2])) 820 && IS_DEVICE_SEP (s[1]) && IS_DIRECTORY_SEP (s[2]))
821 #ifdef ALTOS 821 #ifdef ALTOS
822 || *s == '@' 822 || *s == '@'
823 #endif 823 #endif
824 #ifdef VMS
825 || strchr (s, ':')
826 #endif /* VMS */
827 ); 824 );
828 } 825 }
829 #endif /* 0 */ 826 #endif /* 0 */
830 827
831 DEFUN ("locate-file", Flocate_file, 2, 4, 0, /* 828 DEFUN ("locate-file", Flocate_file, 2, 4, 0, /*
2965 #ifndef CANNOT_DUMP 2962 #ifndef CANNOT_DUMP
2966 if (purify_flag && NILP (Vload_path)) 2963 if (purify_flag && NILP (Vload_path))
2967 { 2964 {
2968 /* loadup.el will frob this some more. */ 2965 /* loadup.el will frob this some more. */
2969 /* #### unix-specific */ 2966 /* #### unix-specific */
2970 Vload_path = Fcons (build_string ("../lisp/prim"), Vload_path); 2967 Vload_path = Fcons (build_string ("../lisp/"), Vload_path);
2971 } 2968 }
2972 #endif /* not CANNOT_DUMP */ 2969 #endif /* not CANNOT_DUMP */
2973 load_in_progress = 0; 2970 load_in_progress = 0;
2974 2971
2975 Vload_descriptor_list = Qnil; 2972 Vload_descriptor_list = Qnil;