(decode_mode_spec_coding): Delete superfluous code.

Allocate sufficient memory for eol_str in the case that eoltype is
Lisp_Int.

diff --git a/src/ChangeLog b/src/ChangeLog
index 26bade582a5fea652ab46d91a559a633ed0f54a9..1a9caae17e33b01763c4d344295605a422a20929 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,8 @@
 2000-02-17  Kenichi Handa  <handa@etl.go.jp>
 
-       * xdisp.c (decode_mode_spec_coding): Delete superfluous code.
-       Allocate sufficient memory for eol_str in the case that eoltype is
-       Lisp_Int.
+       * xdisp.c (decode_mode_spec_coding): Delete superfluous code to
+       avoid infinite error signaling.  Allocate sufficient memory for
+       eol_str in the case that eoltype is Lisp_Int.
 
 2000-02-17  Stefan Monnier  <monnier@cs.yale.edu>
 

diff --git a/src/xdisp.c b/src/xdisp.c
index e0206ca7ad392493c29e71f6fed94297d34226b4..3a8b8b42e961781afe61acaa93f6b829dc193e9d 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11993,9 +11993,9 @@ decode_mode_spec_coding (coding_system, buf, eol_flag)
   /* The EOL conversion we are using.  */
   Lisp_Object eoltype;
 
-  val = coding_system;
+  val = Fget (coding_system, Qcoding_system);
 
-  if (NILP (val))              /* Not yet decided.  */
+  if (!VECTORP (val))          /* Not yet decided.  */
     {
       if (multibyte)
        *buf++ = '-';
@@ -12009,13 +12009,6 @@ decode_mode_spec_coding (coding_system, buf, eol_flag)
 
       eolvalue = Fget (coding_system, Qeol_type);
 
-      while (!NILP (val) && SYMBOLP (val))
-       {
-         val = Fget (val, Qcoding_system);
-         if (NILP (eolvalue))
-           eolvalue = Fget (val, Qeol_type);
-       }
-
       if (multibyte)
        *buf++ = XFASTINT (XVECTOR (val)->contents[1]);
 
@@ -12046,6 +12039,7 @@ decode_mode_spec_coding (coding_system, buf, eol_flag)
       else if (INTEGERP (eoltype)
               && CHAR_VALID_P (XINT (eoltype), 0))
        {
+         eol_str = (unsigned char *) alloca (MAX_MULTIBYTE_LENGTH);
          eol_str_len = CHAR_STRING (XINT (eoltype), eol_str);
        }
       else