Mercurial > hg > xemacs-beta
comparison src/dired.c @ 118:7d55a9ba150c r20-1b11
Import from CVS: tag r20-1b11
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:24:17 +0200 |
parents | 9f59509498e1 |
children | cca96a509cfe |
comparison
equal
deleted
inserted
replaced
117:578fd4947a72 | 118:7d55a9ba150c |
---|---|
254 */ | 254 */ |
255 (file, dirname)) | 255 (file, dirname)) |
256 { | 256 { |
257 /* This function can GC */ | 257 /* This function can GC */ |
258 Lisp_Object handler; | 258 Lisp_Object handler; |
259 | 259 struct gcpro gcpro1; |
260 | |
261 GCPRO1 (dirname); | |
262 dirname = Fexpand_file_name (dirname, Qnil); | |
260 /* If the file name has special constructs in it, | 263 /* If the file name has special constructs in it, |
261 call the corresponding file handler. */ | 264 call the corresponding file handler. */ |
262 handler = Ffind_file_name_handler (dirname, Qfile_name_all_completions); | 265 handler = Ffind_file_name_handler (dirname, Qfile_name_all_completions); |
266 UNGCPRO; | |
263 if (!NILP (handler)) | 267 if (!NILP (handler)) |
264 return call3 (handler, Qfile_name_all_completions, file, | 268 return call3 (handler, Qfile_name_all_completions, file, |
265 dirname); | 269 dirname); |
266 | 270 |
267 return file_name_completion (file, dirname, 1, 0); | 271 return file_name_completion (file, dirname, 1, 0); |