Mercurial > emacs
comparison src/coding.c @ 17717:4891aaecc5cc
(Fread_coding_system, Fread_non_nil_coding_system):
Pass new arg to Fcompleting_read.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 10 May 1997 03:19:20 +0000 |
| parents | abfa77a2693b |
| children | 92f042f73be2 |
comparison
equal
deleted
inserted
replaced
| 17716:bef751068f42 | 17717:4891aaecc5cc |
|---|---|
| 2746 Lisp_Object obj; | 2746 Lisp_Object obj; |
| 2747 { | 2747 { |
| 2748 return ((NILP (obj) || !NILP (Fcoding_system_vector (obj))) ? Qt : Qnil); | 2748 return ((NILP (obj) || !NILP (Fcoding_system_vector (obj))) ? Qt : Qnil); |
| 2749 } | 2749 } |
| 2750 | 2750 |
| 2751 DEFUN ("read-non-nil-coding-system", | 2751 DEFUN ("read-non-nil-coding-system", Fread_non_nil_coding_system, |
| 2752 Fread_non_nil_coding_system, Sread_non_nil_coding_system, 1, 1, 0, | 2752 Sread_non_nil_coding_system, 1, 1, 0, |
| 2753 "Read a coding system from the minibuffer, prompting with string PROMPT.") | 2753 "Read a coding system from the minibuffer, prompting with string PROMPT.") |
| 2754 (prompt) | 2754 (prompt) |
| 2755 Lisp_Object prompt; | 2755 Lisp_Object prompt; |
| 2756 { | 2756 { |
| 2757 Lisp_Object val; | 2757 Lisp_Object val; |
| 2758 do { | 2758 do |
| 2759 val = Fcompleting_read (prompt, Vobarray, Qcoding_system_vector, | 2759 { |
| 2760 Qt, Qnil, Qnil); | 2760 val = Fcompleting_read (prompt, Vobarray, Qcoding_system_vector, |
| 2761 } while (XSTRING (val)->size == 0); | 2761 Qt, Qnil, Qnil, Qnil); |
| 2762 } | |
| 2763 while (XSTRING (val)->size == 0); | |
| 2762 return (Fintern (val, Qnil)); | 2764 return (Fintern (val, Qnil)); |
| 2763 } | 2765 } |
| 2764 | 2766 |
| 2765 DEFUN ("read-coding-system", Fread_coding_system, Sread_coding_system, 1, 1, 0, | 2767 DEFUN ("read-coding-system", Fread_coding_system, Sread_coding_system, 1, 1, 0, |
| 2766 "Read a coding system or nil from the minibuffer, prompting with string PROMPT.") | 2768 "Read a coding system or nil from the minibuffer, prompting with string PROMPT.") |
| 2767 (prompt) | 2769 (prompt) |
| 2768 Lisp_Object prompt; | 2770 Lisp_Object prompt; |
| 2769 { | 2771 { |
| 2770 Lisp_Object val = Fcompleting_read (prompt, Vobarray, Qcoding_system_p, | 2772 Lisp_Object val = Fcompleting_read (prompt, Vobarray, Qcoding_system_p, |
| 2771 Qt, Qnil, Qnil); | 2773 Qt, Qnil, Qnil, Qnil); |
| 2772 return (XSTRING (val)->size == 0 ? Qnil : Fintern (val, Qnil)); | 2774 return (XSTRING (val)->size == 0 ? Qnil : Fintern (val, Qnil)); |
| 2773 } | 2775 } |
| 2774 | 2776 |
| 2775 DEFUN ("check-coding-system", Fcheck_coding_system, Scheck_coding_system, | 2777 DEFUN ("check-coding-system", Fcheck_coding_system, Scheck_coding_system, |
| 2776 1, 1, 0, | 2778 1, 1, 0, |