revert unnecessary modifications

diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index fedbd61ffd1ec49f3d2c8f9dd91cd8fb89746f52..6a49c60099d119c126119ba20db2afb8d8a9ace3 100644 (file)
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -597,6 +597,4 @@ Otherwise, return nil.  For internal use only."
 (make-obsolete 'macro-declaration-function
                'macro-declarations-alist "24.3")
 
-(provide 'byte-run)
-
 ;;; byte-run.el ends here

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index ebbee2a0c7c11d5a138872559ac2c8c82834c1aa..7be43204a16dd00f637db35cf9109521270ddf91 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -124,7 +124,6 @@
 (require 'backquote)
 (require 'macroexp)
 (require 'cconv)
-(require 'byte-run)
 (eval-when-compile (require 'compile))
 ;; Refrain from using cl-lib at run-time here, since it otherwise prevents
 ;; us from emitting warnings when compiling files which use cl-lib without

diff --git a/src/lread.c b/src/lread.c
index f1b17edd011493ca5b5566629381880fa6adba88..bd7182c398fd0f7f1bc7de4864955c31e139223d 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -4195,16 +4195,13 @@ intern_c_string_1 (const char *str, ptrdiff_t len)
 {
   Lisp_Object obarray = check_obarray (Vobarray);
   Lisp_Object tem = oblookup (obarray, str, len, len);
-  Lisp_Object string;
 
   if (!SYMBOLP (tem))
     {
-      if (NILP (Vpurify_flag))
-       string = make_string (str, len);
-      else
-       string = make_pure_c_string (str, len);
-
-      tem = intern_driver (string, obarray, tem);
+      /* Creating a non-pure string from a string literal not implemented yet.
+        We could just use make_string here and live with the extra copy.  */
+      eassert (!NILP (Vpurify_flag));
+      tem = intern_driver (make_pure_c_string (str, len), obarray, tem);
     }
   return tem;
 }