2 files changed, 10 insertions, 3 deletions

diff --git a/src/lread.c b/src/lread.c
index 5450fa30c33..d8912195f83 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -791,6 +791,15 @@ read1 (readcharfun)
       }
 
     case '#':
+      c = READCHAR;
+      if (c == '[')
+        {
+          /* Accept compiled functions at read-time so that we don't have to
+             build them using function calls.  */
+          Lisp_Object tmp = read_vector (readcharfun);
+          return Fmake_byte_code (XVECTOR(tmp)->size, XVECTOR (tmp)->contents);
+        }
+      UNREAD (c);
       return Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#", 1), Qnil));
 
     case ';':
diff --git a/src/print.c b/src/print.c
index 9eff5250e63..3ef76747a91 100644
--- a/src/print.c
+++ b/src/print.c
@@ -805,7 +805,7 @@ print (obj, printcharfun, escapeflag)
       break;
 
     case Lisp_Compiled:
-      strout ("#<byte-code ", -1, printcharfun);
+      strout ("#", -1, printcharfun);
     case Lisp_Vector:
       PRINTCHAR ('[');
       {
@@ -819,8 +819,6 @@ print (obj, printcharfun, escapeflag)
           }
       }
       PRINTCHAR (']');
-      if (XTYPE (obj) == Lisp_Compiled)
-        PRINTCHAR ('>');
       break;
 
 #ifndef standalone