Merge remote-tracking branch 'savannah/master' into HEAD

1 files changed, 21 insertions, 5 deletions

diff --git a/src/lread.c b/src/lread.c
index 01f359ca581..46725d9b0ff 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3030,8 +3030,26 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
           struct Lisp_Vector *vec;
           tmp = read_vector (readcharfun, 1);
           vec = XVECTOR (tmp);
-          if (vec->header.size == 0)
-            invalid_syntax ("Empty byte-code object");
+          if (! (COMPILED_STACK_DEPTH < vec->header.size
+                 && (FIXNUMP (vec->contents[COMPILED_ARGLIST])
+                     || CONSP (vec->contents[COMPILED_ARGLIST])
+                     || NILP (vec->contents[COMPILED_ARGLIST]))
+                 && ((STRINGP (vec->contents[COMPILED_BYTECODE])
+                      && VECTORP (vec->contents[COMPILED_CONSTANTS]))
+                     || CONSP (vec->contents[COMPILED_BYTECODE]))
+                 && FIXNATP (vec->contents[COMPILED_STACK_DEPTH])))
+            invalid_syntax ("Invalid byte-code object");
+
+          if (STRING_MULTIBYTE (AREF (tmp, COMPILED_BYTECODE)))
+            {
+              /* BYTESTR must have been produced by Emacs 20.2 or earlier
+                 because it produced a raw 8-bit string for byte-code and
+                 now such a byte-code string is loaded as multibyte with
+                 raw 8-bit characters converted to multibyte form.
+                 Convert them back to the original unibyte form.  */
+              ASET (tmp, COMPILED_BYTECODE,
+                    Fstring_as_unibyte (AREF (tmp, COMPILED_BYTECODE)));
+            }
 
           if (COMPILED_DOC_STRING < vec->header.size
               && EQ (AREF (tmp, COMPILED_DOC_STRING), make_fixnum (0)))
@@ -3050,7 +3068,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
               ASET (tmp, COMPILED_DOC_STRING, make_ufixnum (hash));
             }
 
-          make_byte_code (vec);
+          XSETPVECTYPE (vec, PVEC_COMPILED);
           return tmp;
         }
       if (c == '(')
@@ -3888,8 +3906,6 @@ read_vector (Lisp_Object readcharfun, bool bytecodeflag)
 {
   Lisp_Object tem = read_list (1, readcharfun);
   ptrdiff_t size = list_length (tem);
-  if (bytecodeflag && size <= COMPILED_STACK_DEPTH)
-    error ("Invalid byte code");
   Lisp_Object vector = make_nil_vector (size);
 
   Lisp_Object *ptr = XVECTOR (vector)->contents;