aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raeburn2000-04-08 19:34:29 +0000
committerKen Raeburn2000-04-08 19:34:29 +0000
commit8000e212ef3cefdf190624c9607def66bda2bf8a (patch)
treec54532c077512c666aa81c2f704a5a8d46711d98
parentf32318377bef5e5b07c0396fd77c3c7b0c107c82 (diff)
downloademacs-8000e212ef3cefdf190624c9607def66bda2bf8a.tar.gz
emacs-8000e212ef3cefdf190624c9607def66bda2bf8a.zip
* coding.h (code_convert_string): Declare.
* coding.c (code_convert_string_norecord): Pass an int, not a lisp object, as the fourth argument to code_convert_string.
-rw-r--r--src/coding.c2
-rw-r--r--src/coding.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c
index fcd5e89e004..92e5af8b390 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -5654,7 +5654,7 @@ code_convert_string_norecord (string, coding_system, encodep)
5654 5654
5655 coding.composing = COMPOSITION_DISABLED; 5655 coding.composing = COMPOSITION_DISABLED;
5656 coding.mode |= CODING_MODE_LAST_BLOCK; 5656 coding.mode |= CODING_MODE_LAST_BLOCK;
5657 return code_convert_string (string, &coding, encodep, Qt); 5657 return code_convert_string (string, &coding, encodep, 1);
5658} 5658}
5659 5659
5660DEFUN ("decode-sjis-char", Fdecode_sjis_char, Sdecode_sjis_char, 1, 1, 0, 5660DEFUN ("decode-sjis-char", Fdecode_sjis_char, Sdecode_sjis_char, 1, 1, 0,
diff --git a/src/coding.h b/src/coding.h
index d226d433a0a..12c14da4d02 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -597,6 +597,8 @@ extern int conversion_buffer_size;
597extern char *conversion_buffer; 597extern char *conversion_buffer;
598extern char *get_conversion_buffer P_ ((int)); 598extern char *get_conversion_buffer P_ ((int));
599extern int setup_coding_system P_ ((Lisp_Object, struct coding_system *)); 599extern int setup_coding_system P_ ((Lisp_Object, struct coding_system *));
600extern Lisp_Object code_convert_string P_ ((Lisp_Object,
601 struct coding_system *, int, int));
600extern void setup_raw_text_coding_system P_ ((struct coding_system *)); 602extern void setup_raw_text_coding_system P_ ((struct coding_system *));
601extern Lisp_Object Qcoding_system, Qeol_type, Qcoding_category_index; 603extern Lisp_Object Qcoding_system, Qeol_type, Qcoding_category_index;
602extern Lisp_Object Qraw_text, Qemacs_mule; 604extern Lisp_Object Qraw_text, Qemacs_mule;