aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/coding.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/coding.c b/src/coding.c
index d70d4b92770..4fae220750a 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -253,6 +253,7 @@ Lisp_Object Qcoding_system, Qeol_type;
253Lisp_Object Qbuffer_file_coding_system; 253Lisp_Object Qbuffer_file_coding_system;
254Lisp_Object Qpost_read_conversion, Qpre_write_conversion; 254Lisp_Object Qpost_read_conversion, Qpre_write_conversion;
255Lisp_Object Qno_conversion, Qundecided; 255Lisp_Object Qno_conversion, Qundecided;
256Lisp_Object Qcoding_system_history;
256 257
257extern Lisp_Object Qinsert_file_contents, Qwrite_region; 258extern Lisp_Object Qinsert_file_contents, Qwrite_region;
258Lisp_Object Qcall_process, Qcall_process_region, Qprocess_argument; 259Lisp_Object Qcall_process, Qcall_process_region, Qprocess_argument;
@@ -3118,7 +3119,7 @@ DEFUN ("read-coding-system", Fread_coding_system, Sread_coding_system, 1, 1, 0,
3118{ 3119{
3119 Lisp_Object val; 3120 Lisp_Object val;
3120 val = Fcompleting_read (prompt, Vobarray, Qcoding_system_p, 3121 val = Fcompleting_read (prompt, Vobarray, Qcoding_system_p,
3121 Qt, Qnil, Qnil, Qnil, Qnil); 3122 Qt, Qnil, Qcoding_system_history, Qnil, Qnil);
3122 return (XSTRING (val)->size == 0 ? Qnil : Fintern (val, Qnil)); 3123 return (XSTRING (val)->size == 0 ? Qnil : Fintern (val, Qnil));
3123} 3124}
3124 3125
@@ -3863,6 +3864,10 @@ syms_of_coding ()
3863 Qtarget_idx = intern ("target-idx"); 3864 Qtarget_idx = intern ("target-idx");
3864 staticpro (&Qtarget_idx); 3865 staticpro (&Qtarget_idx);
3865 3866
3867 Qcoding_system_history = intern ("coding-system-history");
3868 staticpro (&Qcoding_system_history);
3869 Fset (Qcoding_system_history, Qnil);
3870
3866 /* Target FILENAME is the first argument. */ 3871 /* Target FILENAME is the first argument. */
3867 Fput (Qinsert_file_contents, Qtarget_idx, make_number (0)); 3872 Fput (Qinsert_file_contents, Qtarget_idx, make_number (0));
3868 /* Target FILENAME is the third argument. */ 3873 /* Target FILENAME is the third argument. */
@@ -4104,7 +4109,7 @@ the cdr part is used for encoding a text to be sent to a process.");
4104 "Table of extra Latin codes in the range 128..159 (inclusive).\n\ 4109 "Table of extra Latin codes in the range 128..159 (inclusive).\n\
4105This is a vector of length 256.\n\ 4110This is a vector of length 256.\n\
4106If Nth element is non-nil, the existence of code N in a file\n\ 4111If Nth element is non-nil, the existence of code N in a file\n\
4107(or output of subprocess) doesn't prevent it to be detected as\n\ 4112\(or output of subprocess) doesn't prevent it to be detected as\n\
4108a coding system of ISO 2022 variant which has a flag\n\ 4113a coding system of ISO 2022 variant which has a flag\n\
4109`accept-latin-extra-code' t (e.g. iso-latin-1) on reading a file\n\ 4114`accept-latin-extra-code' t (e.g. iso-latin-1) on reading a file\n\
4110or reading output of a subprocess.\n\ 4115or reading output of a subprocess.\n\