diff options
| author | Richard M. Stallman | 1997-05-10 03:19:20 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-05-10 03:19:20 +0000 |
| commit | 9d991de859ab0d42f6e16373fe522dfeebc0b2f5 (patch) | |
| tree | 18b74f24915e45107bacaa118f71641b1ae36e8f | |
| parent | 690f91845e50e25638d81e9678ff036ec43d96ec (diff) | |
| download | emacs-9d991de859ab0d42f6e16373fe522dfeebc0b2f5.tar.gz emacs-9d991de859ab0d42f6e16373fe522dfeebc0b2f5.zip | |
(Fread_coding_system, Fread_non_nil_coding_system):
Pass new arg to Fcompleting_read.
| -rw-r--r-- | src/coding.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/coding.c b/src/coding.c index 2d14c7aeafc..faae05d9136 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -2748,17 +2748,19 @@ See document of make-coding-system for coding-system object.") | |||
| 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 | ||
| @@ -2768,7 +2770,7 @@ DEFUN ("read-coding-system", Fread_coding_system, Sread_coding_system, 1, 1, 0, | |||
| 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 | ||