Mercurial > emacs
comparison src/fileio.c @ 110314:405e3949f580
* lisp/subr.el (y-or-n-p): New function, moved from src/fns.c. Use read-key.
* src/fns.c (Fy_or_n_p): Move to lisp/subr.el.
(syms_of_fns): Don't defsubr Sy_or_n_p.
* src/lisp.h: Don't declare Fy_or_n_p.
* src/fileio.c (barf_or_query_if_file_exists): Fy_or_n_p -> y-or-n-p.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sun, 12 Sep 2010 16:35:37 +0200 |
| parents | 64732fa6188a |
| children | 55c8c3ca3d48 |
comparison
equal
deleted
inserted
replaced
| 110313:50c8f347bd8e | 110314:405e3949f580 |
|---|---|
| 1840 build_string ("File already exists"), absname); | 1840 build_string ("File already exists"), absname); |
| 1841 GCPRO1 (absname); | 1841 GCPRO1 (absname); |
| 1842 tem = format2 ("File %s already exists; %s anyway? ", | 1842 tem = format2 ("File %s already exists; %s anyway? ", |
| 1843 absname, build_string (querystring)); | 1843 absname, build_string (querystring)); |
| 1844 if (quick) | 1844 if (quick) |
| 1845 tem = Fy_or_n_p (tem); | 1845 tem = call1 (intern ("y-or-n-p"), tem); |
| 1846 else | 1846 else |
| 1847 tem = do_yes_or_no_p (tem); | 1847 tem = do_yes_or_no_p (tem); |
| 1848 UNGCPRO; | 1848 UNGCPRO; |
| 1849 if (NILP (tem)) | 1849 if (NILP (tem)) |
| 1850 xsignal2 (Qfile_already_exists, | 1850 xsignal2 (Qfile_already_exists, |